From bf870a0951f5439bfe2e22426173320858aa118a Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 12 Apr 2020 00:25:04 +0200 Subject: [PATCH] Zwischencommit 3 Agenturverbund --- standards/models.py | 3 + .../standards/agencynetwork_content.html | 221 ++++++++++++++++++ .../standards/standards_management.html | 16 ++ standards/views.py | 6 +- 4 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 standards/templates/standards/agencynetwork_content.html diff --git a/standards/models.py b/standards/models.py index 3656254..e0cb86f 100644 --- a/standards/models.py +++ b/standards/models.py @@ -65,6 +65,9 @@ class Standards(models.Model): # FIELD FOR AGENCYNETWORK comments = models.ManyToManyField("StandardComments", blank=True, related_name='comments') parent_standard = models.ForeignKey("Standards", related_name='partentedstandard', on_delete=models.PROTECT, blank=True, null=True, default=None) + + + #Counter, wie oft dieser Standard in eine andere Agentur kopiert wird agencynetworkcounter = models.IntegerField(default=0) def __str__(self): diff --git a/standards/templates/standards/agencynetwork_content.html b/standards/templates/standards/agencynetwork_content.html new file mode 100644 index 0000000..c7e3a6d --- /dev/null +++ b/standards/templates/standards/agencynetwork_content.html @@ -0,0 +1,221 @@ +
+
+
+
+

+ +

+
+
+
+ + +
+
+
Beliebte Standards
+

+ Keine +

+
+
+
+
+ \ No newline at end of file diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 5cf534e..b89aa02 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -23,6 +23,10 @@ {% endfor %} + + {% if perms.users.standard_management %} @@ -79,6 +83,16 @@ {% endfor %} +
+

Standards aus Agenturverbünden

+ + {% block agnet %} + {% include "standards/agencynetwork_content.html" %} + {% endblock %} +
+ + +

Eigene Standards

@@ -130,6 +144,8 @@
+ +

Unveröffentlichte Standards

diff --git a/standards/views.py b/standards/views.py index 9a8a090..3055108 100644 --- a/standards/views.py +++ b/standards/views.py @@ -40,7 +40,11 @@ class StandardsManagement(LoginRequiredMixin, ListView): #context.update({'active_link' : 'standards', 'tasks': tasks, 'unpubstandards_of_user' : unpubstandards_of_user, 'standards_of_agency' : standards_of_agency, 'areas' : areas, 'standards_of_user' : standards_of_user, 'standardcontent' : standardcontent}) - context.update({'active_link' : 'standards', 'unpubstandards_of_user' : unpubstandards_of_user, 'areas' : areas, 'standards_of_user' : standards_of_user, 'standardcontent' : standardcontent}) + agencynetworks = AgencyNetwork.objects.filter(creator_agency=self.request.user.profile.agency) | AgencyNetwork.objects.filter(adminagencys__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(members__in=[self.request.user.profile.agency.pk]) | AgencyNetwork.objects.filter(sharemembers__in=[self.request.user.profile.agency.pk]) + + + + context.update({'active_link' : 'standards', 'unpubstandards_of_user' : unpubstandards_of_user, 'areas' : areas, 'standards_of_user' : standards_of_user, 'standardcontent' : standardcontent, "agencynetworks" : agencynetworks}) return context