progress section shows status of the picture(approved or not), admin works fully

reValuate/home/views.py

@@ -7,13 +7,18 @@ def homePage(request):
     all_balance = []
 
     try:
+        balObject = Balance.objects.filter(user=request.user.id)
+        userBalance = balObject.values("balanceValue")
         a = Balance.objects.all()
         for user in a:
             all_balance.append(user.balanceValue)
         print(f"{all_balance}")
         context = {
-            "currencyTotal":sum(all_balance)
+            "currencyTotal": sum(all_balance),
+            "userBalance": userBalance[0]["balanceValue"]
         }
+
+                
         return render(request, "home.html", context)
         
 
@@ -23,4 +28,3 @@ def homePage(request):
             "currencyTotal":e
         }
         return render(request, "home.html", context)
-        

reValuate/templates/addBalance.html

@@ -14,7 +14,7 @@
 		<form method="post" enctype="multipart/form-data">
 			{% csrf_token %}
 			<input name="user_instance" id="user_instance" placeholder="Pencho Slaveikov"><br>
-			<input name="tokens", id="tokens", placeholder="523...">
+			<input name="tokens" id="tokens" placeholder="523...">
 			<button type="submit">Upload</button>
 		</form>
 		

reValuate/templates/adminView.html

@@ -54,8 +54,8 @@
       </div>
       <div class="choiceButtons">
 
-      <input type="submit" value="Valid">
+      <input name="isValid" type="submit" value="Valid">
-      <input type="submit" value="Invalid">
+      <input name="isValid" type="submit" value="Invalid">
     </form>
 
 
@@ -67,6 +67,7 @@
       <h1 class="emoji">🥳</h1>
       <h1 class="emoji">🎉</h1>
     </div>
+    
     {% endif %}
     
     

reValuate/templates/home.html

@@ -83,7 +83,8 @@
 					<h1><strong>reValuate</strong><br />
 					</h1>
 					{% if user.is_authenticated %}
-					<p>Здравей, {{ user.username }}!</p>
+					<p>Здравей, {{ user.username }}!</p><br>
+					<p>Баланса ти е: {{ userBalance }}  reCoins</p>
 						<ul class="actions special">
 					<li><a href="/upload/" class="button scrolly">Качи!</a></li>
                     <li><a href="/view_media/" class="button scrolly">Виж прогреса   си!</a></li>

reValuate/templates/showAllImage.html

@@ -6,8 +6,16 @@
 {% if user.is_authenticated %}
   Hi {{ user.username }}!<br>
   
-  {% for image in images %}
+  {% for i in get_status reversed %}
-  <img src="/media/images/{{ id }}/{{ image }}" style="max-width:500px"/>
+  <img src="/media/{{ i.image }}" style="max-width:500px"/>
+  {% if i.reason %}
+  <span> cross</span>
+  {% elif i.tokenized  %}
+  <span>checkmark</span>
+  {% else %}
+  <span> Processing </span>
+  {% endif %}
+  <br><br>
   {% endfor %}
 
 

reValuate/upload/migrations/0010_auto_20210312_2339.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.6 on 2021-03-12 21:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('upload', '0009_auto_20210311_1910'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='videos',
+            name='tokenized',
+            field=models.BooleanField(blank=True, default=None, null=True),
+        ),
+    ]

reValuate/upload/migrations/0011_auto_20210312_2341.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.6 on 2021-03-12 21:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('upload', '0010_auto_20210312_2339'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='videos',
+            name='tokenized',
+            field=models.BooleanField(blank=True, default=None, max_length=3, null=True),
+        ),
+    ]

reValuate/upload/migrations/0012_auto_20210312_2347.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.6 on 2021-03-12 21:47
+
+from django.db import migrations, models
+import upload.models
+import upload.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('upload', '0011_auto_20210312_2341'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='image',
+            name='image',
+            field=models.ImageField(unique=True, upload_to=upload.models.imagesPath, validators=[upload.validators.imageValidate]),
+        ),
+        migrations.AlterField(
+            model_name='image',
+            name='tokenized',
+            field=models.BooleanField(blank=True, default=None, max_length=3, null=True),
+        ),
+    ]

reValuate/upload/models.py

@@ -19,8 +19,8 @@ def videosPath(instance,filename):
     
 class Image(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True)
-    image = models.ImageField(upload_to=imagesPath,validators=[imageValidate])
+    image = models.ImageField(upload_to=imagesPath,validators=[imageValidate], unique=True)
-    tokenized = models.BooleanField(default=False)
+    tokenized = models.BooleanField(blank=True, null=True, default=None, max_length=3)
     reason = models.CharField(max_length=120)
     
     class Meta:
@@ -30,7 +30,7 @@ class Image(models.Model):
 class Videos(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True)
     video = models.FileField(upload_to=videosPath, validators=[videoValidate])
-    tokenized = models.BooleanField(default=False)
+    tokenized = models.BooleanField(blank=True, null=True, default=None, max_length=3)
     reason = models.CharField(max_length=120)
 
 

reValuate/upload/views.py

@@ -58,9 +58,12 @@ def videoUpload(request):
 def viewMedia(request):
     path = settings.MEDIA_ROOT
     img_list = os.listdir(path + f"images/{request.user.id}/")
+    get_status = Image.objects.filter(user_id=request.user.id)
+
     context = {
         "images": img_list,
         "id":request.user.id,
+        "get_status":get_status,
     }
     return render (request, 'showAllImage.html', context)
 

reValuate/users/views.py

@@ -64,17 +64,12 @@ def getBalance(request):
     return render(request,"getBalance.html", {"userBalance":userBalance} )
     
 def adminView(request):
-    congrats = None
     try:
-        latestPicture = Image.objects.filter(tokenized=False)
+        latestPicture = Image.objects.filter(tokenized=None)
         latestPicture, userId = latestPicture.values("image")[0]["image"], latestPicture.values("user_id")[0]["user_id"]
         
         if request.method == "POST":
-            if request.POST.get('Valid','True'):
+            if request.POST['isValid'] == "Valid":
-                imageObj = Image.objects.get(image=latestPicture, user_id=userId)
-                imageObj.tokenized = True
-                imageObj.save()
-                addBal = Balance.objects.get(user_id=userId)
                 try:
                     user_instance = Balance.objects.get(user=userId)
                     sum_balance = 5 + user_instance.balanceValue
@@ -85,10 +80,21 @@ def adminView(request):
                     balAdd = Balance(balanceValue=5, user_id=userId)
                     balAdd.save()
                 
+                imageObj = Image.objects.get(image=latestPicture, user_id=userId)
+                imageObj.tokenized = True
+                imageObj.save()
+
                 return redirect("/admin/")
+            elif request.POST['isValid'] == "Invalid":
+                imageObj = Image.objects.get(image=latestPicture, user_id=userId)
+                imageObj.tokenized=True
+                imageObj.reason="Invalid"
+                imageObj.save()
+                return render(request, "adminView.html", {"image":latestPicture, "userId":userId})
+            
+
             else:
-            Image.objects.get(image=latestPicture, user_id=userId).delete()
+                return render(request, "adminView")
         return render(request, "adminView.html", {"image":latestPicture, "userId":userId})   
     except IndexError:
         return render(request, "adminView.html")   
-    return render(request, "adminView.html")