Added pipework/linework comments to each page

This commit is contained in:
Frank Schubert
2022-05-03 17:09:14 +02:00
parent b5983b27f1
commit ed2dda4443
6 changed files with 48 additions and 19 deletions
+6 -1
View File
@@ -337,7 +337,12 @@
<tr>
<td colspan="3">
<label class="form-label">Kommentar</label> <textarea class="form-control" style="height:100%" form="wf-termination-<?=$term->id?>" name="workflow_comment" id="workflow_comment_<?=$term->id?>"><?=$term->workflow_comment?></textarea>
<label class="form-label">Kommentar Tiefbau (<?=$term->building->street?>)</label>
<textarea class="form-control" style="height:100%" form="wf-termination-<?=$term->id?>" name="workflow_comment_building" id="workflow_comment_building_<?=$term->id?>"><?=$term->building->workflow_comment?></textarea>
</td>
<td colspan="3">
<label class="form-label">Kommentar Anschluss (<?=$term->code?>)</label>
<textarea class="form-control" style="height:100%" form="wf-termination-<?=$term->id?>" name="workflow_comment" id="workflow_comment_<?=$term->id?>"><?=$term->workflow_comment?></textarea>
</td>
<td colspan="<?=$wfColspan - 3?>">
<h5>Dokumente</h5>
+6 -1
View File
@@ -170,8 +170,13 @@
<tr>
<td colspan="3">
<label class="form-label">Kommentar</label> <textarea class="form-control" style="height:100%" form="wf-building-<?=$building->id?>" name="workflow_comment" id="workflow_comment_<?=$building->id?>"><?=$building->workflow_comment?></textarea>
<label class="form-label">Kommentar Tiefbau</label> <textarea class="form-control" style="height:100%" form="wf-building-<?=$building->id?>" name="workflow_comment" id="workflow_comment_<?=$building->id?>"><?=$building->workflow_comment?></textarea>
</td>
<?php if($building->termination_workflow_comments): ?>
<td colspan="3">
<label class="form-label">Kommentare Leitungsbau</label> <textarea class="form-control" style="height:100%" form="wf-building-<?=$building->id?>" name="workflow_comment_term" id="workflow_comment_term_<?=$building->id?>" readonly="readonly"><?=$building->termination_workflow_comments?></textarea>
</td>
<?php endif; ?>
<td colspan="<?=$wfColspan - 3?>">
<h5>Dokumente</h5>
<table class="table-sm">
+12
View File
@@ -10,6 +10,7 @@ class Building extends mfBaseModel {
private $status;
private $pipeworker;
private $terminations;
private $termination_workflow_comments;
private $workflowitems;
private $files;
private $pipework_enabler;
@@ -223,6 +224,17 @@ class Building extends mfBaseModel {
return $this->terminations;
}
if($name == "termination_workflow_comments") {
$comments = "";
foreach($this->getProperty("terminations") as $term) {
if($term->workflow_comment) {
$comment .= $term->code.": ".trim($term->workflow_comment)."\n\n";
}
}
$this->termination_workflow_comments = $comment;
return $this->termination_workflow_comments;
}
if($name == "workflowitems") {
$this->loadWorkflowItems();
foreach(WorkflowitemModel::search(["object_type" => "building", "active" => 1]) as $item) {
@@ -214,6 +214,13 @@ class LineworkController extends mfBaseController {
$termination->save();
}
if($termination->building->workflow_comment != $r->workflow_comment_building) {
$termination->building->workflow_comment = $r->workflow_comment_building;
$termination->building->workflow_comment_changed = date('U');
$termination->building->workflow_comment_changed_by = $this->me->id;
$termination->building->save();
}
$items = [];
// get workflow values from request