Други дейности по проекта
+Защо да участвам?
-
- 
-
-
- Популяризация:
-- информация на сайта на проекта/ на училището
- информация на страницата на училището в соц.мрежи
- презентации по класове
- плакати на ключови места в училище
- стените на класните стаи в google classroom
- тик- ток видеа с образователна и забавна цел
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
- Защо да участвам?
+
- награден фонд за участие в проекта: напитки, вафли, солети и голяма награда ваучер за пазаруване от голяма верига. Наградите се разпределят спрямо натрупаните точки в сайта.
- Сертификат за участие в извънкласни дейности от името на училището при натрупани минимум 30 точки.
diff --git a/reValuate/templates/removeBalance.html b/reValuate/templates/removeBalance.html index f10159d1..fc58e0ec 100644 --- a/reValuate/templates/removeBalance.html +++ b/reValuate/templates/removeBalance.html @@ -8,13 +8,15 @@ -
Hello, {{ user.username }} !
+
Здравей, {{ user.username }} !
Ако злоупотребяваш с правата си за сайта ще бъдеш баннат. Big Brother is watching you.
+
+ {% endif %}
+
{% if user.is_authenticated %}
{% if img_obj %}
diff --git a/reValuate/upload/__pycache__/models.cpython-38.pyc b/reValuate/upload/__pycache__/models.cpython-38.pyc
index 08f98c4b..a46fa3ef 100644
Binary files a/reValuate/upload/__pycache__/models.cpython-38.pyc and b/reValuate/upload/__pycache__/models.cpython-38.pyc differ
diff --git a/reValuate/upload/__pycache__/views.cpython-38.pyc b/reValuate/upload/__pycache__/views.cpython-38.pyc
index ed7e720d..a4624d33 100644
Binary files a/reValuate/upload/__pycache__/views.cpython-38.pyc and b/reValuate/upload/__pycache__/views.cpython-38.pyc differ
diff --git a/reValuate/upload/migrations/0024_media_managed_by.py b/reValuate/upload/migrations/0024_media_managed_by.py
new file mode 100644
index 00000000..18b17b8f
--- /dev/null
+++ b/reValuate/upload/migrations/0024_media_managed_by.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.6 on 2021-03-16 12:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('upload', '0023_auto_20210315_1901'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='media',
+ name='managed_by',
+ field=models.CharField(blank=True, default=None, max_length=30, null=True),
+ ),
+ ]
diff --git a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc
new file mode 100644
index 00000000..375224ca
Binary files /dev/null and b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc differ
diff --git a/reValuate/upload/models.py b/reValuate/upload/models.py
index 6ddf8e67..7a4df2b5 100644
--- a/reValuate/upload/models.py
+++ b/reValuate/upload/models.py
@@ -26,6 +26,7 @@ class Media(models.Model):
reason = models.CharField(max_length=120)
date = models.DateField(default=date.today)
time = models.TimeField(auto_now=True)
+ managed_by = models.CharField(max_length=30, blank=True, null=True, default=None, )
class Meta:
diff --git a/reValuate/upload/views.py b/reValuate/upload/views.py
index f8a73519..c55db8e6 100644
--- a/reValuate/upload/views.py
+++ b/reValuate/upload/views.py
@@ -24,6 +24,11 @@ def uploadContent(request):
def imageUpload(request):
"""Process images uploaded by users"""
+
+ if request.user.groups.filter(name='Processor').exists():
+ warning = True
+ else:
+ warning = False
print(request.user.id)
if request.method == 'POST':
@@ -46,7 +51,7 @@ def imageUpload(request):
video_obj.user = request.user
video_obj.is_video = True
form.save()
- return render(request, 'uploadImage.html', {'form': form, 'img_obj': video_obj})
+ return render(request, 'uploadImage.html', {'form': form, 'img_obj': video_obj, 'warning':warning})
else:
raise Exception("What")
else:
@@ -54,7 +59,7 @@ def imageUpload(request):
else:
form = ImageForm()
- return render(request, 'uploadImage.html', {'form': form})
+ return render(request, 'uploadImage.html', {'form': form, 'warning':warning})
# def videoUpload(request):
# """Process videos uploaded by users"""
diff --git a/reValuate/users/__pycache__/models.cpython-38.pyc b/reValuate/users/__pycache__/models.cpython-38.pyc
index d6e4de9b..93aa6b28 100644
Binary files a/reValuate/users/__pycache__/models.cpython-38.pyc and b/reValuate/users/__pycache__/models.cpython-38.pyc differ
diff --git a/reValuate/users/__pycache__/views.cpython-38.pyc b/reValuate/users/__pycache__/views.cpython-38.pyc
index 91dcb821..cdda4933 100644
Binary files a/reValuate/users/__pycache__/views.cpython-38.pyc and b/reValuate/users/__pycache__/views.cpython-38.pyc differ
diff --git a/reValuate/users/migrations/0008_transaction.py b/reValuate/users/migrations/0008_transaction.py
new file mode 100644
index 00000000..50060a6b
--- /dev/null
+++ b/reValuate/users/migrations/0008_transaction.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.1.6 on 2021-03-16 12:06
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('auth', '0012_alter_user_first_name_max_length'),
+ ('users', '0007_balance'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Transaction',
+ fields=[
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.user')),
+ ('date', models.DateField(default=datetime.date.today)),
+ ('item', models.CharField(blank=True, default=None, max_length=30, null=True)),
+ ],
+ ),
+ ]
diff --git a/reValuate/users/migrations/0009_auto_20210316_1408.py b/reValuate/users/migrations/0009_auto_20210316_1408.py
new file mode 100644
index 00000000..c8806b83
--- /dev/null
+++ b/reValuate/users/migrations/0009_auto_20210316_1408.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.6 on 2021-03-16 12:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0008_transaction'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='transaction',
+ old_name='user',
+ new_name='client',
+ ),
+ migrations.AddField(
+ model_name='transaction',
+ name='cashier',
+ field=models.CharField(blank=True, default=None, max_length=30, null=True),
+ ),
+ ]
diff --git a/reValuate/users/migrations/0010_auto_20210316_1415.py b/reValuate/users/migrations/0010_auto_20210316_1415.py
new file mode 100644
index 00000000..85627f1e
--- /dev/null
+++ b/reValuate/users/migrations/0010_auto_20210316_1415.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1.6 on 2021-03-16 12:15
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('users', '0009_auto_20210316_1408'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='transaction',
+ name='cashier',
+ field=models.OneToOneField(default=None, on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.user'),
+ preserve_default=False,
+ ),
+ migrations.AlterField(
+ model_name='transaction',
+ name='client',
+ field=models.CharField(blank=True, default=None, max_length=30, null=True),
+ ),
+ ]
diff --git a/reValuate/users/migrations/0011_auto_20210316_1420.py b/reValuate/users/migrations/0011_auto_20210316_1420.py
new file mode 100644
index 00000000..d631a866
--- /dev/null
+++ b/reValuate/users/migrations/0011_auto_20210316_1420.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.1.6 on 2021-03-16 12:20
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('users', '0010_auto_20210316_1415'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='transaction',
+ name='cashier',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/reValuate/users/migrations/0012_auto_20210316_1421.py b/reValuate/users/migrations/0012_auto_20210316_1421.py
new file mode 100644
index 00000000..376687c1
--- /dev/null
+++ b/reValuate/users/migrations/0012_auto_20210316_1421.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1.6 on 2021-03-16 12:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('users', '0011_auto_20210316_1420'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='transaction',
+ name='id',
+ field=models.AutoField(auto_created=True, default=None, primary_key=True, serialize=False, verbose_name='ID'),
+ preserve_default=False,
+ ),
+ migrations.AlterField(
+ model_name='transaction',
+ name='cashier',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc
new file mode 100644
index 00000000..9c80343e
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc
new file mode 100644
index 00000000..ab25c326
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc
new file mode 100644
index 00000000..2ae9e450
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc
new file mode 100644
index 00000000..afce42d2
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc differ
diff --git a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc
new file mode 100644
index 00000000..8e37a349
Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc differ
diff --git a/reValuate/users/models.py b/reValuate/users/models.py
index 6aef5ae2..85197d25 100644
--- a/reValuate/users/models.py
+++ b/reValuate/users/models.py
@@ -1,7 +1,14 @@
from django.db import models
from django.contrib.auth.models import User
-
+from datetime import date
class Balance(models.Model):
user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
balanceValue = models.IntegerField(default=0)
+
+class Transaction(models.Model):
+ cashier = models.ForeignKey(User, on_delete=models.CASCADE)
+ client = models.CharField(max_length=30, blank=True, null=True, default=None, )
+ date = models.DateField(default=date.today)
+ item = models.CharField(max_length=30, blank=True, null=True, default=None, )
+
diff --git a/reValuate/users/views.py b/reValuate/users/views.py
index 2bf762ce..ce9751a0 100644
--- a/reValuate/users/views.py
+++ b/reValuate/users/views.py
@@ -1,7 +1,7 @@
from django.contrib.auth.forms import UserCreationForm
from django.urls import reverse_lazy
from django.views import generic
-from .models import Balance
+from .models import Balance, Transaction
from django.shortcuts import render, redirect, get_object_or_404
from django.contrib.auth.models import User
from django.contrib import messages
@@ -30,7 +30,7 @@ def addToBalance(request):
print(balAdd)
return render(request, "addBalance.html", {"message": f"Added balance to user {user_given}"})
except Balance.DoesNotExist:
- balAdd = Balance(balanceValue=tokens, user_id=user_given)
+ balAdd = Balance(balanceValue=kens, user_id=user_given)
balAdd.save()
return render(request, "addBalance.html", {"message": f"Created and added tokens to {user_given}'s token account"})
@@ -45,7 +45,10 @@ def removeBalance(request):
tokens = request.POST["tokens"]
tokens = int(tokens) * -1
user_given = request.POST["user_instance"]
+ item = request.POST["item"]
+ user_taken = request.user
try:
+ transAdd = Transaction.objects.create(client=user_given, cashier=user_taken, item=item)
user_instance = Balance.objects.get(user=user_given)
sum_balance = user_instance.balanceValue + tokens
balRem = Balance(balanceValue=sum_balance, user_id=user_instance)
@@ -92,6 +95,8 @@ def adminView(request):
imageObj = Media.objects.get(image=latestPicture, user_id=userId)
imageObj.tokenized = True
+ imageObj.managed_by = request.user.username
+
imageObj.save()
return redirect("/admin/")
@@ -99,6 +104,7 @@ def adminView(request):
imageObj = Media.objects.get(image=latestPicture, user_id=userId)
imageObj.tokenized=False
imageObj.reason="Invalid"
+ imageObj.managed_by = request.user.username
imageObj.save()
return render(request, "adminView.html", {"time":time, "date":date,"image":latestPicture, "userId":userId, "username":username, "is_video":is_video})