diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc index 4921b19..c7250da 100644 Binary files a/standards/__pycache__/forms.cpython-38.pyc and b/standards/__pycache__/forms.cpython-38.pyc differ diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index ef0bc1b..4588c24 100644 Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ 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}'