From 7ee687c20190ab260f759422a12dcf531d3c16f9 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 9 Sep 2021 23:37:24 +0200
Subject: [PATCH] Added colspan attribute to workflow items

---
 Layout/default/Linework/Index.php           | 4 ++--
 Layout/default/Workflow/form.php            | 2 +-
 application/Linework/LineworkController.php | 2 +-
 public/assets/css/thetool.css               | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 928b824db..49b76a407 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -1,5 +1,5 @@
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
-<?php $wftype = "termination"; ?>
+<?php $wftype = "term"; ?>
 
 
     <!-- start page title -->
@@ -141,7 +141,7 @@
                     <td>
                       <form method="post" name="wf-termination-<?=$term->id?>" id="wf-termination-<?=$term->id?>" action="<?=self::getUrl("Linework","save", ["filter" => $filter])?>" enctype="multipart/form-data" >
                         <input type="hidden" name="id" value="<?=$term->id?>" />
-                        <table class="table workflow-table">
+                        <table class="table ">
                             <?php $i = 0; foreach($term->workflowitems as $item): ?>
                               <?php if($i==0): ?>
                                 <?php if($item->type == "delimiter"): ?>
diff --git a/Layout/default/Workflow/form.php b/Layout/default/Workflow/form.php
index 1f7bd03fa..38579ddc0 100644
--- a/Layout/default/Workflow/form.php
+++ b/Layout/default/Workflow/form.php
@@ -1,4 +1,4 @@
-<td class="workflow-item">
+      <td class="workflow-item" <?=($item->width > 1) ? "colspan='".$item->width."'" : ""?>>
   <?php if($item->type != "gps"): ?>
     <label class="form-label" for="wfitem_<?=$item->name?>_<?=$$wftype->id?>">
       <?=($item->label) ? $item->label : "&nbsp;"?>
diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php
index aeff1fb7c..92e42c6bc 100644
--- a/application/Linework/LineworkController.php
+++ b/application/Linework/LineworkController.php
@@ -109,7 +109,7 @@ class LineworkController extends mfBaseController {
           break;
         }
 
-        $i++;
+        $i += ($wfitem->width) ? $wfitem->width : 1;
       }
     }
     //var_dump($item_colspan);exit;
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 4f0aa2b9e..3eb0166c0 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -61,7 +61,7 @@
   padding-bottom: 4px;
   border-top: none;
   min-width: 138px;
-  max-width: 138px;
+  
 }
 
 .workflow-header {
@@ -76,13 +76,13 @@
 
 .workflow-table .workflow-item select {
   padding-left: 4px;
-  width:100%;
+  min-width:138px;
   /*max-width: 138px;*/
 }
 
 .workflow-item input[type=text] {
   max-width:100%;
-  /*width: 128px;*/
+  0width: 138px;
 }
 
 .padding-left-2 {