Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.

Commit d14923d

Browse files
Rollbacked to the previous for the error happening ion the quiz options
1 parent 234b238 commit d14923d

File tree

12 files changed

+280
-237
lines changed

12 files changed

+280
-237
lines changed
-14 Bytes
Binary file not shown.
-136 Bytes
Binary file not shown.

Profile/admin.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
from django.contrib import admin
22
from .models import HelpCenter, Profile, Wallet, Transaction, Referral, RecentEarnings, ResetPassword, SocialAccount
33

4+
45
# Register your models here.
56
class ProfileAdmin(admin.ModelAdmin):
67
search_fields = ['user__username']
78

9+
810
admin.site.register(Profile, ProfileAdmin)
911

12+
1013
class WalletAdmin(admin.ModelAdmin):
1114
list_display = ('user', 'points')
1215
search_fields = ('user__username', 'points')
1316

17+
1418
admin.site.register(Wallet, WalletAdmin)
1519

20+
1621
class TransactionAdmin(admin.ModelAdmin):
1722
list_display = ['user', 'points', 'payment_method', 'completed']
1823
list_filter = ['completed']
1924

20-
admin.site.register(Transaction, TransactionAdmin)
2125

26+
admin.site.register(Transaction, TransactionAdmin)
2227

23-
admin.site.register(Referral)
2428

2529
class RecentEarningsAdmin(admin.ModelAdmin):
2630
list_display = ['user', 'way_to_earn', 'point_earned', 'created_at']
2731
list_filter = ['user']
2832

33+
2934
admin.site.register(RecentEarnings, RecentEarningsAdmin)
3035
admin.site.register(ResetPassword)
3136
admin.site.register(SocialAccount)
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Generated by Django 3.2.18 on 2023-07-08 05:14
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('Profile', '0019_auto_20230701_0102'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='recentearnings',
16+
name='created_at',
17+
field=models.DateField(default=datetime.date(2023, 7, 8)),
18+
),
19+
migrations.AlterField(
20+
model_name='referral',
21+
name='signed_up_at',
22+
field=models.DateField(default=datetime.date(2023, 7, 8)),
23+
),
24+
migrations.AlterField(
25+
model_name='transaction',
26+
name='created_at',
27+
field=models.DateField(default=datetime.date(2023, 7, 8)),
28+
),
29+
]
Binary file not shown.

Profile/models.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from django.db import models
44
from django.contrib.auth.models import User
55
import os
6-
from django.db.models.signals import post_save
6+
from django.db.models.signals import post_save, post_delete
77
from django.dispatch import receiver
88
from django.utils.crypto import get_random_string
99
from django.utils import timezone
@@ -92,9 +92,7 @@ class Referral(models.Model):
9292
signed_up_at = models.DateField(default=timezone.now().date())
9393

9494
def __str__(self) -> str:
95-
referred_user = self.user.user.username
96-
referred_by = Profile.objects.get(user_code=self.code).user.username
97-
return f"The user {referred_user} was referred by the user {referred_by} at {self.signed_up_at}"
95+
return self.user.user.username
9896

9997

10098
class ResetPassword(models.Model):
34 Bytes
Binary file not shown.
23 Bytes
Binary file not shown.
-1.7 KB
Binary file not shown.

rewards/models.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.db import models
22
from django.contrib.auth.models import User
3+
from django.db.models import CharField
34
from django.dispatch import receiver
45
from django.db.models.signals import post_save
56
from django.core.validators import MaxValueValidator, MinValueValidator
@@ -67,7 +68,7 @@ def __str__(self) -> str:
6768
class Subject(models.Model):
6869
subject = models.CharField(max_length=100)
6970

70-
def __str__(self) -> str:
71+
def __str__(self) -> CharField:
7172
return self.subject
7273

7374

@@ -80,5 +81,17 @@ class Questions(models.Model):
8081
choice4 = models.CharField(max_length=200)
8182
answer = models.CharField(max_length=200)
8283

83-
def __str__(self) -> str:
84+
def __str__(self) -> CharField:
8485
return self.question
86+
87+
88+
# class ZoloVideos(models.Model):
89+
# user = models.ForeignKey(User, on_delete=models.CASCADE)
90+
# videos_watched = models.PositiveIntegerField(default=0, validators=[MinValueValidator(0), MaxValueValidator(5)])
91+
# last_watched = models.DateTimeField(auto_now=True)
92+
#
93+
# @receiver(post_save, sender=User)
94+
# def createGameInstance(sender, instance, created):
95+
# if created:
96+
# ZoloVideos.objects.create(user=instance)
97+

0 commit comments

Comments
 (0)