New Updates

.gitignore

@@ -3,6 +3,7 @@
 .settings.py
 *.sqlite3
 migrations
+.venv
 .yardımcıvenv
 .idea
 .settings.py

muduryardimcisi/muduryardimci/admin.py

@@ -1,12 +1,11 @@
 from django.contrib import admin
-from .models import Site,Check,Courses,Note,Profile
+from .models import Site,Check,Courses,Profile
 admin.site.register(Profile)
 admin.site.register(Site)
 admin.site.register(Courses)
-admin.site.register(Note)
 
 @admin.register(Check)
 class CheckAdmin(admin.ModelAdmin):
-    list_display = ('course_id','user_id','course_check',"check_morning",'check_afternoon','check_evening')
-    list_filter = ['course_id__course_name', 'course_check', "check_morning", 'check_afternoon', 'check_evening']
-    search_fields = ['course_check','user_id__username','course_id__course_name']
+    list_display = ('course_id','user_id',"check_morning",'check_afternoon','check_evening','check_date')
+    list_filter = ['course_id__course_name', "check_morning", 'check_afternoon', 'check_evening','check_date']
+    search_fields = ['user_id__username','course_id__course_name']

muduryardimcisi/muduryardimci/forms.py

@@ -1,14 +1,4 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
-from muduryardimci.models import Courses,Profile
-class AuthTokenForm(forms.Form):
-    token_label = forms.CharField(max_length=6)
-
-class AddNoteForm(forms.Form):
-    Note = forms.CharField(max_length=3000)
-    Course = forms.ModelChoiceField(Courses.objects.all(),required=True,empty_label="Select Course")
-    User = forms.ModelChoiceField(Profile.objects.filter(course_id=Course.label))
 
-    def __init__(self, user, *args, **kwargs):
-        super(AddNoteForm, self).__init__(*args, **kwargs)
-        self.fields['User'].queryset = Profile.objects.filter(course_id = user)
+class AuthTokenForm(forms.Form):
+    token_label = forms.CharField(max_length=10)

muduryardimcisi/muduryardimci/models.py

@@ -1,8 +1,10 @@
 from django.conf import settings
 from django.db import models
 from django.contrib.auth.models import User
+from django.utils import timezone
 from django.core.validators import RegexValidator
 
+
 class Site(models.Model):
 
     name = models.CharField(max_length=255, unique=True)
@@ -12,97 +14,77 @@ class Site(models.Model):
     domain = models.CharField(max_length=100)
     start_date = models.DateField()
     end_Date = models.DateField()
-    course_start = models.CharField(max_length=15,default="")
+    course_start = models.CharField(max_length=15, default="")
     total_morning_date = models.FloatField()
     total_afternoon_date = models.FloatField()
     total_evening_date = models.FloatField()
 
     def __str__(self):
         return self.domain
 
+
 class Courses(models.Model):
     course_name = models.CharField(max_length=255)
 
     course_token = models.CharField(
-                   max_length=255,
-                   default="",
-                   null="",
-                   blank=True,)
-
+        max_length=255,
+        default="",
+        null="",
+        blank=True,)
 
     trainess = models.ForeignKey(
-               default="",
-               to=settings.AUTH_USER_MODEL,
-               on_delete=models.CASCADE,
-               related_name="trainess_name",
-                        )
+        default="",
+        to=settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="trainess_name",
+    )
 
     trainer = models.ForeignKey(
-              default="",
-              to=settings.AUTH_USER_MODEL,
-              on_delete=models.CASCADE,
-              related_name="trainer_name",
-              )
+        default="",
+        to=settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="trainer_name",
+    )
 
     authorized_trainer = models.ForeignKey(
-                         default="",
-                         to=settings.AUTH_USER_MODEL,
-                         on_delete=models.CASCADE,
-                         related_name="authorized_trainer_name",
-                         )
+        default="",
+        to=settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="authorized_trainer_name",
+    )
 
     def __str__(self):
         return self.course_name
 
     class Meta:
         verbose_name_plural = "Courses"
 
+
 class Check(models.Model):
     course_id = models.ForeignKey(
-                default="",
-                to=Courses,
-                related_name="Check_Course_id",
-                on_delete=models.CASCADE,
-                blank=True,
-                                  )
+        default="",
+        to=Courses,
+        related_name="Check_Course_id",
+        on_delete=models.CASCADE,
+        blank=True,
+    )
     user_id = models.ForeignKey(
-               default="",
-               to=settings.AUTH_USER_MODEL,
-               related_name="Check_user_id",
-               on_delete=models.CASCADE,
-               blank=True,
+        default="",
+        to=settings.AUTH_USER_MODEL,
+        related_name="Check_user_id",
+        on_delete=models.CASCADE,
+        blank=True,
     )
 
-    course_check = models.CharField(max_length=255, unique=True,blank=True)
-    check_morning = models.BooleanField(default=False,blank=True)
-    check_afternoon = models.BooleanField(default=False,blank=True)
-    check_evening = models.BooleanField(default=False,blank=True,)
-
-    def __str__(self):
-        return self.course_check
-
-class Note(models.Model):
-    user_id = models.ForeignKey(
-            default="",
-            to=settings.AUTH_USER_MODEL,
-            related_name="Note_user_id",
-            on_delete=models.CASCADE,
-            )
-    trainer_id = models.ForeignKey(
-            default="",
-            to=settings.AUTH_USER_MODEL,
-            related_name="Note_trainer_id",
-            on_delete=models.CASCADE,
-            )
-    notes = models.TextField(
-            max_length=2000
-            )
-    site_id = models.ForeignKey(
-            default="",
-            to=Site,
-            related_name="Note_site_id",
-            on_delete=models.CASCADE,
-            )
+    course_check = models.NullBooleanField(
+        null=True, blank=True, primary_key=False,)
+    check_morning = models.NullBooleanField(
+        null=True, blank=True, primary_key=False,)
+    check_afternoon = models.NullBooleanField(
+        null=True, blank=True, primary_key=False,)
+    check_evening = models.NullBooleanField(
+        null=True, blank=True, primary_key=False,)
+    check_date = models.DateField(default=timezone.now(), blank=True,)
 
     def __str__(self):
         return self.notes
@@ -111,30 +93,38 @@ def __str__(self):
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     course_id = models.ForeignKey(
-                default=None,
-                to=Courses,
-                on_delete=models.CASCADE,
-                blank=True,
-                null=True,
-                )
+        default=None,
+        to=Courses,
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+    )
 
     email = models.CharField(
-                    max_length=255,
-                    blank=True,
-                    null=True,
-            )
-    phone_regex = RegexValidator(regex=r'^\+?1?\d{9,15}$',
-                                 message="""Telefon numaranız 5340775723 şeklinde girilmelidir."
-                                          14 haneye kadar izin verilir. """,)
-
-    cellphone = models.CharField(validators=[phone_regex],max_length=14)
+        max_length=255,
+        blank=True,
+        null=True,
+    )
+    phone_regex = RegexValidator(
+        regex=r'^\+?1?\d{9,15}$',
+        message="""Telefon numaranız 5340775723 şeklinde girilmelidir."
+                                          14 haneye kadar izin verilir. """,
+    )
+
+    cellphone = models.CharField(validators=[phone_regex], max_length=14)
     telegram_username = models.CharField(
-                        max_length=25,
-                        blank=True,
-                        null=True,)
+        max_length=25,
+        blank=True,
+        null=True,)
     is_trainer = models.BooleanField(
-                 default=False,
+        default=False,
 
     )
+    token_remains = models.IntegerField(
+        default=3,
+        blank=True,
+        null=True,
+    )
+
     def __str__(self):
-        return self.email
+        return self.cellphone