Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MPC addition #76

Merged
merged 5 commits into from
Dec 16, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Startoverleg removed
reinout committed Dec 16, 2024
commit 80eb80854532e9f391e28c4135659a9a7ca5d0f9
17 changes: 17 additions & 0 deletions trs/migrations/0011_remove_project_startup_meeting_done.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 3.2.16 on 2024-12-16 19:57

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('trs', '0010_auto_20241216_1859'),
]

operations = [
migrations.RemoveField(
model_name='project',
name='startup_meeting_done',
),
]
3 changes: 0 additions & 3 deletions trs/models.py
Original file line number Diff line number Diff line change
@@ -558,9 +558,6 @@ class Project(models.Model):
),
default=False,
)
startup_meeting_done = models.BooleanField(
verbose_name="startoverleg heeft plaatsgevonden", default=False
)
is_subsidized = models.BooleanField(
verbose_name="subsidieproject",
help_text=(
11 changes: 0 additions & 11 deletions trs/templates/trs/project.html
Original file line number Diff line number Diff line change
@@ -118,17 +118,6 @@ <h1>
<th>Laatste week</th>
<td>{{ view.project.end.friendly|default:"Niet ingevuld" }}</td>
</tr>
<tr>
<th>Startoverleg</th>
<td>
{% if view.project.startup_meeting_done %}
<span class="glyphicon glyphicon-ok"></span>
Het startoverleg heeft plaatsgevonden
{% else %}
<span class="glyphicon glyphicon-remove"></span>
{% endif %}
</td>
</tr>
<tr>
<th>Goedgekeurd</th>
<td>
21 changes: 0 additions & 21 deletions trs/views.py
Original file line number Diff line number Diff line change
@@ -804,20 +804,6 @@ def filters_and_choices(self):
{"value": "true", "title": "wel", "q": Q(is_accepted=True)},
],
},
{
"title": "Startoverleg",
"param": "startup_meeting_done",
"default": "all",
"choices": [
{"value": "all", "title": "Geen filter", "q": Q()},
{"value": "false", "title": "nog niet", "q": Q(is_accepted=False)},
{
"value": "true",
"title": "wel gehouden",
"q": Q(is_accepted=True),
},
],
},
{
"title": "Groep",
"param": "group",
@@ -946,7 +932,6 @@ def normally_visible_filters(self):
result += [
"is_subsidized",
"is_accepted",
"startup_meeting_done",
"started",
"ended",
"ratings",
@@ -1652,7 +1637,6 @@ def fields(self):
"project_leader",
"project_manager",
# Note: the next two are shown only on the edit view!
"startup_meeting_done",
"is_accepted",
"remark",
"financial_remark",
@@ -1672,9 +1656,6 @@ def fields(self):
"rating_customer",
"rating_customer_reason",
]
if self.active_person == self.project.project_leader:
if not self.project.startup_meeting_done:
result.append("startup_meeting_done")
if self.active_person == self.project.project_manager:
# if not self.project.is_accepted:
# result.append('is_accepted')
@@ -3071,7 +3052,6 @@ def has_form_permissions(self):
"Software ontwikkeling",
"Afdracht",
"Opdrachtbevestiging binnen",
"Startoverleg",
"Geaccepteerd",
"Cijfer team",
"Cijfer klant",
@@ -3132,7 +3112,6 @@ def excel_lines(self):
project.software_development,
project.profit,
project.confirmation_date,
project.startup_meeting_done,
project.is_accepted,
project.rating_projectteam,
project.rating_customer,