diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index a9e0bfbd2..95f5517ed 100644 --- a/Layout/default/Linework/Index.php +++ b/Layout/default/Linework/Index.php @@ -361,7 +361,26 @@ $(document).ready(function() { var id_match = $(this).attr("id").match(/wfitem_abschlusstyp_(\d+)$/); var id = id_match[1]; - if($('#wfitem_ist_abschlusstyp_' + id).val() == "SC/APC in FTU") { + if($('#wfitem_ist_abschlusstyp_' + id).val() == "") { + if($(this).val() == "SC/APC in FTU") { + $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show(); + $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').show(); + } else { + $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide(); + $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide(); + } + } else { + console.log("ist not empty"); + if($('#wfitem_ist_abschlusstyp_' + id).val() == "SC/APC in FTU") { + $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show(); + $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').show(); + } else { + $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide(); + $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide(); + } + } + /* + if($('#wfitem_ist_abschlusstyp_' + id).val().length && $('#wfitem_ist_abschlusstyp_' + id).val() != "SC/APC in FTU") { $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide(); $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide(); } else { @@ -372,7 +391,7 @@ $(document).ready(function() { $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show(); $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').show(); } - } + }*/ }); $(elem).change(); }); @@ -384,20 +403,22 @@ $(document).ready(function() { var id = id_match[1]; if($(this).val() == "") { + console.log("ist empty"); if($('#wfitem_abschlusstyp_' + id).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(); + } else { + $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide(); + $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide(); } } else { - 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 { + console.log("ist not empty"); + if($('#wfitem_ist_abschlusstyp_' + id).val() == "SC/APC in FTU") { $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show(); $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').show(); + } else { + $('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').hide(); + $('#workflow-item-inhouse_cabling_deployed-' + id + ' .wf-content').hide(); } } }); @@ -449,11 +470,13 @@ function validateWorkflowItem(id) { 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") { + if($("#wfitem_ist_abschlusstyp_" + id).val() == "SC/APC in FTU") { required_fields["inhouse_cabling_supplied"] = "bool"; required_fields["inhouse_cabling_deployed"] = "bool"; - } - + } else if($("#wfitem_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) { diff --git a/scripts/check_building_status.php b/scripts/check_building_status.php new file mode 100644 index 000000000..dc024b9df --- /dev/null +++ b/scripts/check_building_status.php @@ -0,0 +1,37 @@ +#!/usr/bin/php + 1]); + + +echo TT_WORKFLOW_ITEM_STATUS_FIELD."\n"; +echo TT_WORKFLOW_ITEM_STATUS_VALUE_PASSED."\n"; +echo TT_WORKFLOW_ITEM_STATUS_VALUE_CONNECTED."\n"; + +foreach($buildings as $building) { + if(array_key_exists(TT_WORKFLOW_ITEM_STATUS_FIELD, $building->workflowitems)) { + if($building->workflowitems[TT_WORKFLOW_ITEM_STATUS_FIELD]->value->value_string == TT_WORKFLOW_ITEM_STATUS_VALUE_PASSED) { + echo TT_WORKFLOW_ITEM_STATUS_VALUE_PASSED." (4) ".$building->id."\n"; + //$building->status_id = 4; + //$building->save(); + } + if($building->workflowitems[TT_WORKFLOW_ITEM_STATUS_FIELD]->value->value_string == TT_WORKFLOW_ITEM_STATUS_VALUE_CONNECTED) { + echo TT_WORKFLOW_ITEM_STATUS_VALUE_CONNECTED." (5) ".$building->id."\n"; + //$building->status_id = 5; + //$building->save(); + } + } +} \ No newline at end of file