From f80c4432194d4312121e3e38c1401fe772573179 Mon Sep 17 00:00:00 2001 From: Moshe Nahmias Date: Mon, 29 Jul 2024 21:21:50 +0300 Subject: [PATCH] WIP --- djang/importer/models.py | 3 +++ djang/importer/templates/importer/base.html | 10 ++++++++++ djang/importer/templates/importer/index.html | 10 ++++++++++ djang/importer/templates/importer/kupa.html | 7 +++++++ djang/importer/views.py | 10 +++++----- 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 djang/importer/templates/importer/base.html create mode 100644 djang/importer/templates/importer/index.html create mode 100644 djang/importer/templates/importer/kupa.html diff --git a/djang/importer/models.py b/djang/importer/models.py index 11a8b1e..54919ea 100644 --- a/djang/importer/models.py +++ b/djang/importer/models.py @@ -6,6 +6,9 @@ class Kupot(models.Model): track_number = models.CharField(max_length=255) track_code = models.CharField(max_length=255, null=True) + def __str__(self): + return f'{self.company} {self.track}' + class Reports(models.Model): kupa = models.ForeignKey(Kupot, on_delete=models.CASCADE) report_date = models.DateField() diff --git a/djang/importer/templates/importer/base.html b/djang/importer/templates/importer/base.html new file mode 100644 index 0000000..a7159b3 --- /dev/null +++ b/djang/importer/templates/importer/base.html @@ -0,0 +1,10 @@ + + + + + Title + + +{% block content %}{% endblock %} + + diff --git a/djang/importer/templates/importer/index.html b/djang/importer/templates/importer/index.html new file mode 100644 index 0000000..26a0762 --- /dev/null +++ b/djang/importer/templates/importer/index.html @@ -0,0 +1,10 @@ +{% extends 'importer/base.html' %} +{% block content %} +רשימת החברות: +
+ +{% endblock %} \ No newline at end of file diff --git a/djang/importer/templates/importer/kupa.html b/djang/importer/templates/importer/kupa.html new file mode 100644 index 0000000..9c4b47b --- /dev/null +++ b/djang/importer/templates/importer/kupa.html @@ -0,0 +1,7 @@ +רשימת מסלולים ל-{{ company_name }}:
+
+ \ No newline at end of file diff --git a/djang/importer/views.py b/djang/importer/views.py index 8090bba..98341be 100644 --- a/djang/importer/views.py +++ b/djang/importer/views.py @@ -4,13 +4,12 @@ root="/" + def companies(request): output = "רשימת החברות:
" - return HttpResponse(output) + return render(request, 'importer/index.html', context={'company_list': company_list}) + def kupot(request, company_name): output = "רשימת מסלולים ל"+company_name+":

" - return HttpResponse(output) + return render(request, 'importer/kupa.html', context={'company_name': company_name, 'company_list': company_list}) + # return HttpResponse(output) def duchot(request, kupa_id, kupa): output = "רשימת דוח\"ות ל"+str(kupa)+":