From c88f1c280f8f7f45ff4d4b6afb97c0e72580087f Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 6 Mar 2020 22:48:30 +0100
Subject: [PATCH] Standards aenderungen raus

---
 standards/__pycache__/forms.cpython-38.pyc  | Bin 3980 -> 3980 bytes
 standards/__pycache__/models.cpython-38.pyc | Bin 1709 -> 2006 bytes
 standards/forms.py                          |  37 ++++++++++----------
 standards/models.py                         |  12 +++----
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc
index 4921b19b8ed402d88f36557407aaaf17ffb2dda0..c7250da1ef64537d720695424505fbe8389d8e64 100644
GIT binary patch
delta 95
zcmeB??~&&X<>lpK00OzANpX)h@`|%FYED*VpUx~@#4|a7*KYD(_SKAzlO6cvCLia}
yXSCn^ouh)0(RXtJS0)o<+T>e2>5Sf!op}E;)&kYoFjjA_<>O*xH5TF#G5`SQ)f!g-

delta 95
zcmeB??~&&X<>lpK0D^mqlj81d<P~RU)R?TwKAl;rh-Y#DuifOo?5i0aCOh!SO+L<{
y&uF*#J4Xd0qtE67u1qGz)XBGa(iy!bJMsQytO2UAVXWF*%g4pYY9z!XWB>pcWE$lF

diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc
index ef0bc1b32b8f507cf4b995a097cd3f3cdb1e0e2a..4588c24e986b319c3c46b1da0d0a4cd27e7452af 100644
GIT binary patch
delta 483
zcmYjMyHWx%6x}DXU|<nJP*GG=)-SNo(MBt+)Fy?@V&WKG7bn?eq@vK4vB(G5S!v-P
z&^TIITI`HJVr8;2E4gz|a!zh;&V2!2d2j+iMiI+-Yo9*8f`*!%5NuZ@J5c$S`q{_&
zrGagM1(ZiA5%$1@wK27js0(B2RH7~lwT_nrFAg-gEE!TpY$d*HjMyrgMx}cNuAwrT
z5&JsI9_flx;dO1e2d$7{+M@V|ItHB-4rx(>Eg&-d(DNXOEATBo3xf`YxtO|PaM7V8
z=s7C2`M0*CR(MVSD9y>oWeJr8s{BXaR-1g&xK>O2$r$#docs_o><4Z@x;RQF?X9G9
zls|O+-f>6bKEWQMY0(m9T!b(>Cmv?d_K1IlQHuqxk6elvwM0o|bqOPF54U@CR=TJq
nR{l)I6IP{|6#zuCCVw#JfmzmM<l^AZ=DYnrMSQCAyVS-nWbk{o

delta 186
zcmcb{zm}Ibl$V!_0SID`B*iV=$g9H0%?9K-0CDjHhRHUJ=fqO@Qv_NVqGVG9Q-pxD
zTncwEgQoE09;O46r!d<vich}Cd_q(TsG&#{M2N!)iOK6&Y#HSzzhTK`6qy{wdO)*C
q5+o@DSAnD!B*qOSc!9WBX7U;~8Aid$SJ{pWAk=_a5|h`kYXJcI_a;IB

diff --git a/standards/forms.py b/standards/forms.py
index 5bd9cad..3723e2f 100644
--- a/standards/forms.py
+++ b/standards/forms.py
@@ -22,12 +22,12 @@ class StandardAddStandard(forms.ModelForm):
 			"task" : "Tätigkeitsbereich",
 			"content": "Inhalt",
 			"public" : "Direkt veröffentlichen?",
-			#"representative" : "Vertreter",
-			#"executor" : "Ausführender",
-			#"authority" : "Verantwortlicher",
+			"representative" : "Vertreter",
+			"executor" : "Ausführender",
+			"authority" : "Verantwortlicher",
 			}
-		#fields = ['name', 'area', 'task', 'content', 'public', "authority", "executor", "representative"]		
-		fields = ['name', 'area', 'task', 'content', 'public']		
+		fields = ['name', 'area', 'task', 'content', 'public', "authority", "executor", "representative"]		
+		
 	'''
 
 		Hier werden die Elemente für die DropDowns erstellt, damit
@@ -51,13 +51,13 @@ class StandardAddStandard(forms.ModelForm):
 		elif self.instance.pk:
 			self.fields['task'].queryset = Tasks.objects.none()
 
-		#self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
-		#self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
-		#self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
+		self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
+		self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
+		self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=kwargs['instance'].profile.agency.pk)
 
-		#self.fields['checked_groups'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
-		#self.fields['added_files'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
-		#self.fields['added_standards'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
+		self.fields['checked_groups'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
+		self.fields['added_files'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
+		self.fields['added_standards'] = forms.CharField(initial="", required=False, widget=forms.HiddenInput())
 
 
 class StandardAddStandardEditor(forms.ModelForm):
@@ -84,12 +84,11 @@ class StandardUpdateStandard(forms.ModelForm):
 			"area" : "Übergeordneter Bereich",
 			"task" : "Tätigkeitsbereich",
 			"content": "Inhalt",
-			#"representative" : "Vertreter",
-			#"executor" : "Ausführender",
-			#"authority" : "Verantwortlicher",
+			"representative" : "Vertreter",
+			"executor" : "Ausführender",
+			"authority" : "Verantwortlicher",
 			}
-		fields = ['name', 'area', 'task', 'content', "authority", "executor", "representative"]			
-		fields = ['name', 'area', 'task', 'content']			
+		fields = ['name', 'area', 'task', 'content', "authority", "executor", "representative"]					
 	'''
 
 		Hier werden die Elemente für die DropDowns erstellt, damit
@@ -116,9 +115,9 @@ class StandardUpdateStandard(forms.ModelForm):
 		elif loggeduser.pk:
 			self.fields['task'].queryset = Tasks.objects.filter(area__pk=standard.area.pk)
 	
-		#self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
-		#self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
-		#self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
+		self.fields['representative'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
+		self.fields['executor'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
+		self.fields['authority'].queryset = UserFullName.objects.filter(profile__agency__pk=loggeduser.profile.agency.pk)
 
 
 class StandardUpdateStandardEditor(forms.ModelForm):
diff --git a/standards/models.py b/standards/models.py
index 607010a..5fff059 100644
--- a/standards/models.py
+++ b/standards/models.py
@@ -32,17 +32,17 @@ class Standards(models.Model):
 
 	# USER
 	# VERTRETER
-	#representative = models.ForeignKey(User, on_delete=models.PROTECT, related_name="user_repr", blank=True, null=True)
+	representative = models.ForeignKey(User, on_delete=models.PROTECT, related_name="user_repr", blank=True, null=True)
 	# AUSFÜHRENDER
-	#executor = models.ForeignKey(User, on_delete=models.PROTECT, related_name="user_executor", blank=True, null=True)
+	executor = models.ForeignKey(User, on_delete=models.PROTECT, related_name="user_executor", blank=True, null=True)
 	# VERANTWORTLICHER
-	#authority = models.ForeignKey(User, on_delete=models.PROTECT, related_name="user_authority", blank=True, null=True)
+	authority = models.ForeignKey(User, on_delete=models.PROTECT, related_name="user_authority", blank=True, null=True)
 	# FILES
-	#addedfiles = models.ManyToManyField(DataFile, blank=True)
+	addedfiles = models.ManyToManyField(DataFile, blank=True)
 	# VERLINKTE STANDARDS
-	#linked_standards = models.ManyToManyField('Standards', blank=True)
+	linked_standards = models.ManyToManyField('Standards', blank=True)
 	# GORUPS
-	#visibleby = models.ManyToManyField(AgencyGroup, blank=True)
+	visibleby = models.ManyToManyField(AgencyGroup, blank=True)
 
 	def __str__(self):
 		return f'{self.name}'