jmarya/azube
jmarya/azube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

work

Browse source
This commit is contained in:
Angelo Rodriguez 2024-12-03 15:15:45 +01:00
parent 638ae328ea
commit d2e6b65a12
8 changed files with 123 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/migrations/0007_approval.py Executable file
View file

@ -0,0 +1,29 @@
# Generated by Django 4.2.16 on 2024-12-03 12:41
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("core", "0006_berichtsheft_num"),
]
operations = [
migrations.CreateModel(
name="Approval",
fields=[
("id", models.AutoField(primary_key=True, serialize=False)),
("user", models.TextField()),
(
"report",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="report",
to="core.berichtsheft",
),
),
],
),
]

18
core/migrations/0008_berichtsheft_needs_rewrite.py Executable file
View file

@ -0,0 +1,18 @@
# Generated by Django 4.2.16 on 2024-12-03 12:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("core", "0007_approval"),
]
operations = [
migrations.AddField(
model_name="berichtsheft",
name="needs_rewrite",
field=models.BooleanField(default=False),
),
]

7
core/models.py
View file

@ -28,13 +28,18 @@ class Berichtsheft(models.Model):
year = models.PositiveIntegerField() year = models.PositiveIntegerField()
week = models.PositiveSmallIntegerField() week = models.PositiveSmallIntegerField()
content = models.JSONField() content = models.JSONField()
needs_rewrite = models.BooleanField(default=False)
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
def __str__(self): def __str__(self):
return f"Berichtsheft: {self.user}, Year: {self.year}, Week: {self.week}" return f"Berichtsheft: {self.user}, Year: {self.year}, Week: {self.week}"
def is_approved(self):
approvals = Approval.objects.filter(report=self.id)
return len(approvals) >= 2
class Approval:
class Approval(models.Model):
id = models.AutoField(primary_key=True) id = models.AutoField(primary_key=True)
user = models.TextField() user = models.TextField()
report = models.ForeignKey( report = models.ForeignKey(

6
core/styles.py Executable file
View file

@ -0,0 +1,6 @@
# Tailwind Styles
STYLE = {
"red_btn": "text-white bg-red-700 hover:bg-red-800 focus:outline-none focus:ring-4 focus:ring-red-300 font-medium rounded-full text-sm px-5 py-2.5 text-center me-2 mb-2 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-900",
"card": "a4-page bg-white shadow-lg p-6 mx-auto my-10",
}

27
core/templates/index.html
View file

@ -1,17 +1,7 @@
<html> <html>
<head> <head>
<title>Azube</title> <title>Azube</title>
<style> <script src="https://cdn.tailwindcss.com"></script>
.grid-container {
display: inline-grid;
grid-template-columns: repeat(3, 1fr);
gap: 5px;
padding: 10px;
border: 1px solid #ddd;
border-radius: 0.5rem;
box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
}
</style>
</head> </head>
<body> <body>
{{ user.display_name }} {{ user.display_name }}
@ -24,11 +14,20 @@
</button> </button>
{% endif %} {% endif %}
<div class="min-h-screen bg-gray-100 flex items-center justify-center">
{% for report in reports %} {% for report in reports %}
<div class="grid-container"> <div class="{{ style.card }}">
<p> {{ report }} </p> <a href="/report/{{ report.id }}"> {{ report }} </a>
</div> </div>
{% if forloop.last %}
{% if report.week != week_now %}
</div>
<button onclick="location = '/write'" class="{{ style.red_btn }}"> Berichtsheft schreiben </button>
{% endif %}
{% endif %}
{% endfor %} {% endfor %}
</div>
</body> </body>
</html> </html>

18
core/templates/report.html Executable file
View file

@ -0,0 +1,18 @@
<html>
<head>
<title> Berichtsheft {{ report.num }} </title>
</head>
<body>
<h1> Berichtsheft {{ report.num }} </h1>
<p> Berichtsheft {{ report.year }} / {{ report.week }} </p>
<p> Is Approved ? {{ approved }} </p>
{% for key, value in report.content.items %}
<p> {{ key }} : {{ value }} </p>
{% endfor %}
</body>
</html>

2
core/urls.py
View file

@ -4,5 +4,5 @@ from . import views
urlpatterns = [ urlpatterns = [
path("", views.index, name="index"), path("", views.index, name="index"),
path("write", views.write_new_report, name="write"), path("write", views.write_new_report, name="write"),
path("test", views.test, name="test"), path("report/<int:report_id>", views.report_detail_page, name="report_detail"),
] ]

35
core/views.py
View file

@ -1,10 +1,12 @@
from django.shortcuts import redirect, render from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from core.forms import extract_post_values from core.forms import extract_post_values
from core.report_templates import ReportTemplates from core.report_templates import ReportTemplates
from core.util import get_week_range, next_date from core.util import get_week_range, next_date
from .azure_auth import AzureUser from .azure_auth import AzureUser
from .models import Berichtsheft from .models import Berichtsheft
from core.styles import STYLE
import datetime import datetime
# Create your views here. # Create your views here.
@ -44,10 +46,18 @@ def write_new_report_get(request):
# Get the latest year and week # Get the latest year and week
latest = user.reports().order_by("-year", "-week").first() latest = user.reports().order_by("-year", "-week").first()
year_now, week_now, _ = datetime.datetime.today().isocalendar()
# Report for this week already exists
if latest is not None:
if latest.year == year_now and latest.week == week_now:
return redirect(f"/report/{latest.id}")
if latest is not None: if latest is not None:
current_year, current_week = next_date(latest.year, latest.week) current_year, current_week = next_date(latest.year, latest.week)
else: else:
current_year, current_week, _ = datetime.datetime.today().isocalendar() current_year, current_week = year_now, week_now
start_date, end_date = get_week_range(current_year, current_week) start_date, end_date = get_week_range(current_year, current_week)
@ -79,7 +89,26 @@ def index(request):
# Get all berichtshefte # Get all berichtshefte
all_reports = user.reports() all_reports = user.reports()
return render(request, "index.html", {"user": user, "reports": all_reports}) year_now, week_now, _ = datetime.datetime.today().isocalendar()
return render(
request,
"index.html",
{"user": user, "reports": all_reports, "week_now": week_now, "style": STYLE},
)
def report_detail_page(request, report_id):
user = AzureUser(request)
report = get_object_or_404(Berichtsheft, id=report_id)
if report.user != user.id:
return HttpResponse("Nah", status=401)
return render(
request, "report.html", {"report": report, "approved": report.is_approved()}
)
def test(request): def test(request):