11768067041

Committed 10 Nov 2024 08:00PM UTC coverage: 66.981% (-0.5%) from 67.439%

Build # 11768067041

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #251 from gm3dmo/provost2

Adding provost menu

Run Details

15 of 31 new or added lines in 3 files covered. (48.39%)

1 existing line in 1 file now uncovered.

568 of 848 relevant lines covered (66.98%)

1.34 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

89.33

/cmp/forms.py

from django.contrib.auth.forms import UserCreationForm, UserChangeForm

from django import forms

from .models import CustomUser

from .models import Country
from .models import Rank
from .models import Cemetery
from .models import PowCamp
from .models import Soldier
from .models import SoldierDeath
from .models import Company
from .models import Decoration
from .models import Acknowledgement
from .models import ProvostAppointment


class CustomUserCreationForm(UserCreationForm):
    class Meta:
        model = CustomUser
        fields = ("email",)


class CustomUserChangeForm(UserChangeForm):
    class Meta:
        model = CustomUser
        fields = ("email",)


class editPowCampForm(forms.ModelForm):
    class Meta:
        model = PowCamp
        fields = "__all__"


class editCemeteryForm(forms.ModelForm):
    class Meta:
        model = Cemetery 
        fields = "__all__"


class editCountryForm(forms.ModelForm):
    class Meta:
        model = Country
        fields = "__all__"

class editAcknowledgementForm(forms.ModelForm):
    class Meta:
        model = Acknowledgement 
        fields = "__all__"


class editCompanyForm(forms.ModelForm):
    class Meta:
        model = Company 
        fields = "__all__"

class editDecorationForm(forms.ModelForm):
    class Meta:
        model = Decoration
        fields = "__all__"


class editRankForm(forms.ModelForm):
    class Meta:
        model = Rank
        fields = "__all__"


class editSoldierDeathForm(forms.ModelForm):
    class Meta:
        model = SoldierDeath
        fields = ["date", "cemetery", "image"]  


class editSoldierForm(forms.ModelForm):
    class Meta:
        model = Soldier
        fields = "__all__"


class ProvostOfficerForm(forms.ModelForm):
    class Meta:
        model = Soldier
        fields = ['id', 'surname', 'initials', 'army_number', 'rank', 'notes']

    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)
        self.fields['rank'].queryset = Rank.objects.filter(rank_class="OF").order_by('name')

    def save(self, commit=True):
        soldier = super().save(commit=False)
        soldier.provost_officer = True  # Set provost_officer to True
        print(soldier)
        if commit:
            soldier.save()
        return soldier

class ProvostAppointmentForm(forms.ModelForm):
    class Meta:
        model = ProvostAppointment
        fields = ['soldier', 'rank', 'date', 'notes']



1	from django.contrib.auth.forms import UserCreationForm, UserChangeForm	2✔
2
3	from django import forms	2✔
4
5	from .models import CustomUser	2✔
6
7	from .models import Country	2✔
8	from .models import Rank	2✔
9	from .models import Cemetery	2✔
10	from .models import PowCamp	2✔
11	from .models import Soldier	2✔
12	from .models import SoldierDeath	2✔
13	from .models import Company	2✔
14	from .models import Decoration	2✔
15	from .models import Acknowledgement	2✔
16	from .models import ProvostAppointment	2✔
17
18
19	class CustomUserCreationForm(UserCreationForm):	2✔
20	class Meta:	2✔
21	model = CustomUser	2✔
22	fields = ("email",)	2✔
23
24
25	class CustomUserChangeForm(UserChangeForm):	2✔
26	class Meta:	2✔
27	model = CustomUser	2✔
28	fields = ("email",)	2✔
29
30
31	class editPowCampForm(forms.ModelForm):	2✔
32	class Meta:	2✔
33	model = PowCamp	2✔
34	fields = "__all__"	2✔
35
36
37	class editCemeteryForm(forms.ModelForm):	2✔
38	class Meta:	2✔
39	model = Cemetery	2✔
40	fields = "__all__"	2✔
41
42
43	class editCountryForm(forms.ModelForm):	2✔
44	class Meta:	2✔
45	model = Country	2✔
46	fields = "__all__"	2✔
47
48	class editAcknowledgementForm(forms.ModelForm):	2✔
49	class Meta:	2✔
50	model = Acknowledgement	2✔
51	fields = "__all__"	2✔
52
53
54	class editCompanyForm(forms.ModelForm):	2✔
55	class Meta:	2✔
56	model = Company	2✔
57	fields = "__all__"	2✔
58
59	class editDecorationForm(forms.ModelForm):	2✔
60	class Meta:	2✔
61	model = Decoration	2✔
62	fields = "__all__"	2✔
63
64
65	class editRankForm(forms.ModelForm):	2✔
66	class Meta:	2✔
67	model = Rank	2✔
68	fields = "__all__"	2✔
69
70
71	class editSoldierDeathForm(forms.ModelForm):	2✔
72	class Meta:	2✔
73	model = SoldierDeath	2✔
74	fields = ["date", "cemetery", "image"]	2✔
75
76
77	class editSoldierForm(forms.ModelForm):	2✔
78	class Meta:	2✔
79	model = Soldier	2✔
80	fields = "__all__"	2✔
81
82
83	class ProvostOfficerForm(forms.ModelForm):	2✔
84	class Meta:	2✔
85	model = Soldier	2✔
86	fields = ['id', 'surname', 'initials', 'army_number', 'rank', 'notes']	2✔
87
88	def __init__(self, args, *kwargs):	2✔
NEW 89	super().__init__(args, *kwargs)	×
NEW 90	self.fields['rank'].queryset = Rank.objects.filter(rank_class="OF").order_by('name')	×
91
92	def save(self, commit=True):	2✔
NEW 93	soldier = super().save(commit=False)	×
NEW 94	soldier.provost_officer = True # Set provost_officer to True	×
NEW 95	print(soldier)	×
NEW 96	if commit:	×
NEW 97	soldier.save()	×
NEW 98	return soldier	×
99
100	class ProvostAppointmentForm(forms.ModelForm):	2✔
101	class Meta:	2✔
102	model = ProvostAppointment	2✔
103	fields = ['soldier', 'rank', 'date', 'notes']	2✔
104
105

gm3dmo / cmp / 11768067041

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous