Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

changed some workflowitems to update every termination in building

Browse Source
This commit is contained in:
Frank Schubert
2021-11-06 14:12:55 +01:00
parent 5935571887
commit 9c84e82d3c
6 changed files with 171 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Layout/default/Linework/Index.php
View File

@@ -358,9 +358,42 @@ $(document).ready(function() {
});
$('select[id^="wfitem_abschlusstyp_"]').each(function() {
var elem = this;
$(elem).change(function() {
var id_match = $(this).attr("id").match(/wfitem_abschlusstyp_(\d+)$/);
var id = id_match[1];
if($(this).val() == "SC/APC in FTU") {
$('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide();
$('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide();
} else {
$('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show();
$('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').show();
}
});
$(elem).change();
});
$('select[id^="wfitem_ist_abschlusstyp_"]').each(function() {
var elem = this;
$(elem).change(function() {
var id_match = $(this).attr("id").match(/wfitem_ist_abschlusstyp_(\d+)$/);
var id = id_match[1];
if($(this).val() == "SC/APC in FTU") {
$('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide();
$('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide();
} else {
$('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show();
$('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').show();
}
});
$(elem).change();
});
$('form[id^="wf-termination-"]').each(function() {
var elem = this;
console.log(elem);
$(elem).submit(function(e) {
console.log(this);
@@ -392,14 +425,19 @@ function validateWorkflowItem(id) {
kundenkabel_typ: "string",
kundenkabel_fasern: "string",
backbone_finished: "bool",
inhouse_cabling_supplied: "bool",
inhouse_cabling_deployed: "bool",
bep_deployed: "bool",
customer_cable_injected: "bool",
spliced_network: "bool",
spliced_customer: "bool",
};
console.log("abschlusstyp: " + $("#wfitem_abschlusstyp_" + id).val());
console.log("ist abschlusstyp: " + $("#wfitem_ist_abschlusstyp_" + id).val());
if($("#wfitem_abschlusstyp_" + id).val() != "SC/APC in FTU" && $("#wfitem_ist_abschlusstyp_" + id).val() != "SC/APC in FTU") {
required_fields["inhouse_cabling_supplied"] = "bool";
required_fields["inhouse_cabling_deployed"] = "bool";
}
var missing = false;
for(var field1 in required_fields) {

2
Layout/default/Order/Form.php
View File

@@ -298,7 +298,7 @@
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="bank_account_bank">Kreitinstitut</label>
<label class="col-lg-2 col-form-label" for="bank_account_bank">Kreditinstitut</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="bank_account_bank" id="bank_account_bank" value="<?=$order->bank_account_bank?>" />
</div>

2
Layout/default/Pipework/Index.php
View File

@@ -289,6 +289,8 @@ $(document).ready(function() {
var pos = $('#building-' + building).offset().top;
$(window).scrollTop(pos - 150 );
}
});
$('select[name=wfitem_pipework_finished]').each(function() {

116
Layout/default/Workflow/form.php
View File

@@ -7,64 +7,66 @@
}
}
?>
<td class="workflow-item wfitem-<?=$item->type?> wfitem-width-<?=$item->width?>" <?=($item->width > 1) ? "colspan='".$item->width."'" : ""?> style="width: <?=$this->commaToDot(round(100 / $wfColspan, 2) * $item->width)?>%">
<?php if($item->type != "gps"): ?>
<label class="form-label <?=$wfLabelClass?>" for="wfitem_<?=$item->name?>_<?=$$wftype->id?>">
<?=($item->label) ? $item->label : "&nbsp;"?>
<?=($item->label && $item->required == 1) ? "*" : ""?>
</label>
<?php endif; ?>
<td id="workflow-item-<?=$item->name?>-<?=$$wftype->id?>" class="workflow-item wfitem-<?=$item->type?> wfitem-width-<?=$item->width?>" <?=($item->width > 1) ? "colspan='".$item->width."'" : ""?> style="width: <?=$this->commaToDot(round(100 / $wfColspan, 2) * $item->width)?>%">
<div class="wf-content">
<?php if($item->type != "gps"): ?>
<label class="form-label <?=$wfLabelClass?>" for="wfitem_<?=$item->name?>_<?=$$wftype->id?>">
<?=($item->label) ? $item->label : "&nbsp;"?>
<?=($item->label && $item->required == 1) ? "*" : ""?>
</label>
<?php endif; ?>
<?php
<?php
switch($item->type) {
case "string":
include(realpath(dirname(__FILE__)."/items/")."/string.php");
break;
case "int":
include(realpath(dirname(__FILE__)."/items/")."/int.php");
break;
case "bool":
include(realpath(dirname(__FILE__)."/items/")."/bool.php");
break;
case "enum":
include(realpath(dirname(__FILE__)."/items/")."/enum.php");
break;
case "text":
include(realpath(dirname(__FILE__)."/items/")."/text.php");
break;
case "file":
include(realpath(dirname(__FILE__)."/items/")."/file.php");
break;
case "gps":
include(realpath(dirname(__FILE__)."/items/")."/gps.php");
break;
case "color":
include(realpath(dirname(__FILE__)."/items/")."/color.php");
break;
case "delimiter":
include(realpath(dirname(__FILE__)."/items/")."/delimiter.php");
break;
case "date":
include(realpath(dirname(__FILE__)."/items/")."/date.php");
break;
case "empty":
include(realpath(dirname(__FILE__)."/items/")."/empty.php");
break;
default:
include(realpath(dirname(__FILE__)."/items/")."/string.php");
}
?>
<div style="overflow-x: hidden">
<small
class="text-info text-mono"
<?php if($item->value->changed): ?>
title="Geändert: <?=date("d.m.Y H:i",$item->value->changed)?> von <?=$item->value->changer->name?> (<?=$item->value->changer->address->getCompanyOrName(true)?>)"
<?php endif; ?>
>
<?php if($item->value->changed): ?>
<?=$item->value->changer->getAbbrName()?>
<?php endif; ?>
</small>
switch($item->type) {
case "string":
include(realpath(dirname(__FILE__)."/items/")."/string.php");
break;
case "int":
include(realpath(dirname(__FILE__)."/items/")."/int.php");
break;
case "bool":
include(realpath(dirname(__FILE__)."/items/")."/bool.php");
break;
case "enum":
include(realpath(dirname(__FILE__)."/items/")."/enum.php");
break;
case "text":
include(realpath(dirname(__FILE__)."/items/")."/text.php");
break;
case "file":
include(realpath(dirname(__FILE__)."/items/")."/file.php");
break;
case "gps":
include(realpath(dirname(__FILE__)."/items/")."/gps.php");
break;
case "color":
include(realpath(dirname(__FILE__)."/items/")."/color.php");
break;
case "delimiter":
include(realpath(dirname(__FILE__)."/items/")."/delimiter.php");
break;
case "date":
include(realpath(dirname(__FILE__)."/items/")."/date.php");
break;
case "empty":
include(realpath(dirname(__FILE__)."/items/")."/empty.php");
break;
default:
include(realpath(dirname(__FILE__)."/items/")."/string.php");
}
?>
<div style="overflow-x: hidden">
<small
class="text-info text-mono"
<?php if($item->value->changed): ?>
title="Geändert: <?=date("d.m.Y H:i",$item->value->changed)?> von <?=$item->value->changer->name?> (<?=$item->value->changer->address->getCompanyOrName(true)?>)"
<?php endif; ?>
>
<?php if($item->value->changed): ?>
<?=$item->value->changer->getAbbrName()?>
<?php endif; ?>
</small>
</div>
</div>
</td>

65
application/Linework/LineworkController.php
View File

@@ -249,10 +249,15 @@ class LineworkController extends mfBaseController {
* Custom checks
*/
if($termination->workflowitems[TT_WORKFLOW_ITEM_LINEWORK_DONE]->value_int) {
$required_fields = ["baugruppe","modul","ports","abschlusstyp","bb_kabel","bb_fasern","kundenkabel_typ","kundenkabel_fasern","backbone_finished","inhouse_cabling_supplied","inhouse_cabling_deployed","bep_deployed","customer_cable_injected","spliced_network","spliced_customer"];
$required_fields = ["baugruppe","modul","ports","abschlusstyp","bb_kabel","bb_fasern","kundenkabel_typ","kundenkabel_fasern","backbone_finished","bep_deployed","customer_cable_injected","spliced_network","spliced_customer"];
//,"inhouse_cabling_supplied","inhouse_cabling_deployed"
if($termination->workflowitems['abschlusstyp']->value->value_string != "SC/APC in FTU" && $termination->workflowitems['ist_abschlusstyp']->value->value_string != "SC/APC in FTU") {
$required_fields[] = "inhouse_cabling_supplied";
$required_fields[] = "inhouse_cabling_deployed";
}
$can_finish = true;
foreach($required_fields as $f) {
$type = $termination->workflowitems[$f]->type;
@@ -262,12 +267,64 @@ class LineworkController extends mfBaseController {
}
if(!$can_finish) {
$this->log->info("Resetting customer_passive_finished because of missing");
$this->log->info("Resetting customer_passive_finished because of missing values");
$termination->workflowitems[TT_WORKFLOW_ITEM_LINEWORK_DONE]->value->value_int = 0;
$termination->workflowitems[TT_WORKFLOW_ITEM_LINEWORK_DONE]->value->save();
}
}
// set values for all terminations in this building
if($termination->workflowitems['bb_kabel']->value->value_string) {
$value = $termination->workflowitems['bb_kabel']->value->value_string;
foreach($termination->building->terminations as $t) {
$t->workflowitems['bb_kabel']->value->value_string = $value;
$t->workflowitems['bb_kabel']->value->save();
}
}
if($termination->workflowitems['bb_kabel_steps']->value->value_string) {
$value = $termination->workflowitems['bb_kabel_steps']->value->value_string;
foreach($termination->building->terminations as $t) {
$t->workflowitems['bb_kabel_steps']->value->value_string = $value;
$t->workflowitems['bb_kabel_steps']->value->save();
}
}
if($termination->workflowitems['kundenkabel_typ']->value->value_string) {
$value = $termination->workflowitems['kundenkabel_typ']->value->value_string;
foreach($termination->building->terminations as $t) {
$t->workflowitems['kundenkabel_typ']->value->value_string = $value;
$t->workflowitems['kundenkabel_typ']->value->save();
}
}
$value = $termination->workflowitems['customer_cable_injected']->value->value_int;
foreach($termination->building->terminations as $t) {
$t->workflowitems['customer_cable_injected']->value->value_int = $value;
$t->workflowitems['customer_cable_injected']->value->save();
}
if($termination->workflowitems['ist_bb_kabel']->value->value_string) {
$value = $termination->workflowitems['ist_bb_kabel']->value->value_string;
foreach($termination->building->terminations as $t) {
$t->workflowitems['ist_bb_kabel']->value->value_string = $value;
$t->workflowitems['ist_bb_kabel']->value->save();
}
}
if($termination->workflowitems['ist_bb_kabel_steps']->value->value_string) {
$value = $termination->workflowitems['ist_bb_kabel_steps']->value->value_string;
foreach($termination->building->terminations as $t) {
$t->workflowitems['ist_bb_kabel_steps']->value->value_string = $value;
$t->workflowitems['ist_bb_kabel_steps']->value->save();
}
}
if($termination->workflowitems['ist_kundenkabel_typ']->value->value_string) {
$value = $termination->workflowitems['ist_kundenkabel_typ']->value->value_string;
foreach($termination->building->terminations as $t) {
$t->workflowitems['ist_kundenkabel_typ']->value->value_string = $value;
$t->workflowitems['ist_kundenkabel_typ']->value->save();
}
}
// file upload
//var_dump($_FILES);exit;
if(array_key_exists("LineworkFileUpload", $_FILES) && !$_FILES['LineworkFileUpload']['error']) {

7
application/Workflowvalue/WorkflowvalueModel.php
View File

@@ -27,6 +27,13 @@ class WorkflowvalueModel {
$me = new User();
$me->loadMe();
if($model->changed === null) {
$model->changed = date('U');
}
if($model->changed_by === null) {
$model->changed_by = $me->id;
}
if($model->create_by === null) {
$model->create_by = $me->id;
}