Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33217 from barredterra/validate-project-dates

Browse Source 
refactor: validate dates in project and task
This commit is contained in:
Deepesh Garg 2022-12-06 12:32:27 +05:30 committed by GitHub
commit 63393fa503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/projects/doctype/project/project.py
View File

@ -42,6 +42,8 @@ class Project(Document):
self.send_welcome_email() self.send_welcome_email()
self.update_costing() self.update_costing()
self.update_percent_complete() self.update_percent_complete()
self.validate_from_to_dates("expected_start_date", "expected_end_date")
self.validate_from_to_dates("actual_start_date", "actual_end_date")
def copy_from_template(self): def copy_from_template(self):
""" """

86
erpnext/projects/doctype/task/task.py
View File

@ -9,6 +9,7 @@ from frappe import _, throw
from frappe.desk.form.assign_to import clear, close_all_assignments from frappe.desk.form.assign_to import clear, close_all_assignments
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.utils import add_days, cstr, date_diff, flt, get_link_to_form, getdate, today from frappe.utils import add_days, cstr, date_diff, flt, get_link_to_form, getdate, today
from frappe.utils.data import format_date
from frappe.utils.nestedset import NestedSet from frappe.utils.nestedset import NestedSet
@ -16,10 +17,6 @@ class CircularReferenceError(frappe.ValidationError):
pass pass
class EndDateCannotBeGreaterThanProjectEndDateError(frappe.ValidationError):
pass
class Task(NestedSet): class Task(NestedSet):
nsm_parent_field = "parent_task" nsm_parent_field = "parent_task"
@ -34,8 +31,6 @@ class Task(NestedSet):
def validate(self): def validate(self):
self.validate_dates() self.validate_dates()
self.validate_parent_expected_end_date()
self.validate_parent_project_dates()
self.validate_progress() self.validate_progress()
self.validate_status() self.validate_status()
self.update_depends_on() self.update_depends_on()
@ -43,51 +38,42 @@ class Task(NestedSet):
self.validate_completed_on() self.validate_completed_on()
def validate_dates(self): def validate_dates(self):
if ( self.validate_from_to_dates("exp_start_date", "exp_end_date")
self.exp_start_date self.validate_from_to_dates("act_start_date", "act_end_date")
and self.exp_end_date self.validate_parent_expected_end_date()
and getdate(self.exp_start_date) > getdate(self.exp_end_date) self.validate_parent_project_dates()
):
frappe.throw(
_("{0} can not be greater than {1}").format(
frappe.bold("Expected Start Date"), frappe.bold("Expected End Date")
)
)
if (
self.act_start_date
and self.act_end_date
and getdate(self.act_start_date) > getdate(self.act_end_date)
):
frappe.throw(
_("{0} can not be greater than {1}").format(
frappe.bold("Actual Start Date"), frappe.bold("Actual End Date")
)
)
def validate_parent_expected_end_date(self): def validate_parent_expected_end_date(self):
if self.parent_task: if not self.parent_task or not self.exp_end_date:
parent_exp_end_date = frappe.db.get_value("Task", self.parent_task, "exp_end_date") return
if parent_exp_end_date and getdate(self.get("exp_end_date")) > getdate(parent_exp_end_date):
frappe.throw( parent_exp_end_date = frappe.db.get_value("Task", self.parent_task, "exp_end_date")
_( if not parent_exp_end_date:
"Expected End Date should be less than or equal to parent task's Expected End Date {0}." return
).format(getdate(parent_exp_end_date))
) if getdate(self.exp_end_date) > getdate(parent_exp_end_date):
frappe.throw(
_(
"Expected End Date should be less than or equal to parent task's Expected End Date {0}."
).format(format_date(parent_exp_end_date)),
frappe.exceptions.InvalidDates,
)
def validate_parent_project_dates(self): def validate_parent_project_dates(self):
if not self.project or frappe.flags.in_test: if not self.project or frappe.flags.in_test:
return return
expected_end_date = frappe.db.get_value("Project", self.project, "expected_end_date") if project_end_date := frappe.db.get_value("Project", self.project, "expected_end_date"):
project_end_date = getdate(project_end_date)
if expected_end_date: for fieldname in ("exp_start_date", "exp_end_date", "act_start_date", "act_end_date"):
validate_project_dates( task_date = self.get(fieldname)
getdate(expected_end_date), self, "exp_start_date", "exp_end_date", "Expected" if task_date and date_diff(project_end_date, getdate(task_date)) < 0:
) frappe.throw(
validate_project_dates( _("Task's {0} cannot be after Project's Expected End Date.").format(
getdate(expected_end_date), self, "act_start_date", "act_end_date", "Actual" _(self.meta.get_label(fieldname))
) ),
frappe.exceptions.InvalidDates,
)
def validate_status(self): def validate_status(self):
if self.is_template and self.status != "Template": if self.is_template and self.status != "Template":
@ -398,15 +384,3 @@ def add_multiple_tasks(data, parent):
def on_doctype_update(): def on_doctype_update():
frappe.db.add_index("Task", ["lft", "rgt"]) frappe.db.add_index("Task", ["lft", "rgt"])
def validate_project_dates(project_end_date, task, task_start, task_end, actual_or_expected_date):
if task.get(task_start) and date_diff(project_end_date, getdate(task.get(task_start))) < 0:
frappe.throw(
_("Task's {0} Start Date cannot be after Project's End Date.").format(actual_or_expected_date)
)
if task.get(task_end) and date_diff(project_end_date, getdate(task.get(task_end))) < 0:
frappe.throw(
_("Task's {0} End Date cannot be after Project's End Date.").format(actual_or_expected_date)
)