From 17f82cec40d31b153e5fd3091cb43f1ea6a74bc8 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 19 Jan 2023 11:51:32 -0700
Subject: [PATCH] Add kanban column to list

---
 addressbook/templates/default/index.xet | 46 ++++++++++++----------
 filemanager/templates/default/index.xet | 30 +++++++-------
 infolog/templates/default/index.xet     | 52 +++++++++++++++----------
 resources/templates/default/show.xet    | 28 +++++++------
 timesheet/templates/default/index.xet   | 24 +++++++-----
 5 files changed, 107 insertions(+), 73 deletions(-)

diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index 2d6af6ee4c..6e56e6a9fd 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -16,6 +16,7 @@
 				<column width="180"/>
 				<column width="40"/>
 				<column width="80" disabled="@no_customfields"/>
+                <column width="120"/>
 				<column width="60%" minWidth="100"/>
 				<column width="80" disabled="@no_distribution_list"/>
 				<column width="80"/>
@@ -82,6 +83,7 @@
 					</et2-vbox>
 					<nextmatch-header label="Room" id="room"/>
 					<nextmatch-customfields id="customfields"/>
+                    <nextmatch-header label="Kanban"/>
 					<nextmatch-header label="Note" id="note"/>
 					<nextmatch-header label="Distribution lists" id="distribution_list"/>
 					<et2-vbox>
@@ -138,26 +140,30 @@
 						<et2-url-phone  id="${row}[tel_cell]" readonly="true" class="telNumbers" statustext="Mobile phone"></et2-url-phone>
 						<et2-url-phone  id="${row}[tel_home]" readonly="true" class="telNumbers" statustext="Home phone"></et2-url-phone>
 						<et2-url-phone  id="${row}[tel_cell_private]" readonly="true" class="telNumbers" statustext="Mobile phone (private)"></et2-url-phone>
-						<et2-url-fax  id="${row}[tel_fax]" readonly="true" statustext="Fax"></et2-url-fax>
-						<et2-url-phone  id="${row}[tel_prefered]" readonly="true" class="telNumbers" statustext="$row_cont[tel_prefer_label]"></et2-url-phone>
-					</et2-vbox>
-					<et2-vbox>
-						<et2-url  id="${row}[url]" readonly="true" class="fixedHeight"></et2-url>
-						<et2-url-email  id="${row}[email]" readonly="true" class="fixedHeight"></et2-url-email>
-						<et2-url-email  id="${row}[email_home]" readonly="true" class="fixedHeight"></et2-url-email>
-					</et2-vbox>
-					<et2-description  id="${row}[room]"></et2-description>
-					<customfields-list id="$row" class="customfields"/>
-					<et2-textarea  id="${row}[note]" readonly="true" noLang="1"></et2-textarea>
-					<et2-description  id="${row}[distrib_lists]"></et2-description>
-					<et2-vbox>
-						<et2-select-account  id="${row}[owner]" readonly="true"></et2-select-account>
-						<et2-select-account  id="${row}[shared_with]" readonly="true" multiple="true"></et2-select-account>
-					</et2-vbox>
-					<et2-description  id="${row}[id]" class="contactid"></et2-description>
-					<et2-vbox>
-                        <et2-link  id="${row}[last_link]" app=""></et2-link>
-                        <et2-link  id="${row}[next_link]" app=""></et2-link>
+                        <et2-url-fax id="${row}[tel_fax]" readonly="true" statustext="Fax"></et2-url-fax>
+                        <et2-url-phone id="${row}[tel_prefered]" readonly="true" class="telNumbers"
+                                       statustext="$row_cont[tel_prefer_label]"></et2-url-phone>
+                    </et2-vbox>
+                    <et2-vbox>
+                        <et2-url id="${row}[url]" readonly="true" class="fixedHeight"></et2-url>
+                        <et2-url-email id="${row}[email]" readonly="true" class="fixedHeight"></et2-url-email>
+                        <et2-url-email id="${row}[email_home]" readonly="true" class="fixedHeight"></et2-url-email>
+                    </et2-vbox>
+                    <et2-description id="${row}[room]"></et2-description>
+                    <customfields-list id="$row" class="customfields"/>
+                    <et2-link-string entryId="${row_cont[id]}" application="addressbook"
+                                     onlyApp="kanban"></et2-link-string>
+                    <et2-textarea id="${row}[note]" readonly="true" noLang="1"></et2-textarea>
+                    <et2-description id="${row}[distrib_lists]"></et2-description>
+                    <et2-vbox>
+                        <et2-select-account id="${row}[owner]" readonly="true"></et2-select-account>
+                        <et2-select-account id="${row}[shared_with]" readonly="true"
+                                            multiple="true"></et2-select-account>
+                    </et2-vbox>
+                    <et2-description id="${row}[id]" class="contactid"></et2-description>
+                    <et2-vbox>
+                        <et2-link id="${row}[last_link]" app=""></et2-link>
+                        <et2-link id="${row}[next_link]" app=""></et2-link>
                     </et2-vbox>
 					<et2-vbox>
 						<et2-date-time  id="${row}[created]" readonly="true" class="noWrap"></et2-date-time>
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index 18129e86a6..ca45ee34fb 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -15,6 +15,7 @@
 				<column width="100"/>
 				<column width="30%"/>
 				<column width="20%"/>
+                <column width="120"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -29,20 +30,23 @@
 					<nextmatch-sortheader label="Group" id="gid"/>
 					<nextmatch-header label="Comment" id="comment"/>
 					<nextmatch-customfields id="customfields" readonly="true"/>
+                    <nextmatch-header label="Kanban"/>
 				</row>
-				<row class="row $row_cont[class]">
-					<et2-vfs-mime  align="center" id="$row"></et2-vfs-mime>
-                    <et2-image  src="${row}[locked]" statustext="$row_cont[locked_status]"></et2-image>
-					<vfs id="$row" no_lang="1"/>
-					<vfs-size align="right" id="${row}[size]"/>
-					<et2-date-time  id="${row}[mtime]" readonly="true"></et2-date-time>
-					<et2-date-time  id="${row}[ctime]" readonly="true"></et2-date-time>
-					<vfs-mode id="${row}[mode]"/>
-					<et2-vfs-uid  id="${row}[uid]" noLang="1"></et2-vfs-uid>
-					<et2-vfs-gid  id="${row}[gid]" noLang="1"></et2-vfs-gid>
-					<et2-description  id="${row}[comment]"></et2-description>
-					<customfields-list id="$row" class="customfields"/>
-				</row>
+                <row class="row $row_cont[class]">
+                    <et2-vfs-mime align="center" id="$row"></et2-vfs-mime>
+                    <et2-image src="${row}[locked]" statustext="$row_cont[locked_status]"></et2-image>
+                    <vfs id="$row" no_lang="1"/>
+                    <vfs-size align="right" id="${row}[size]"/>
+                    <et2-date-time id="${row}[mtime]" readonly="true"></et2-date-time>
+                    <et2-date-time id="${row}[ctime]" readonly="true"></et2-date-time>
+                    <vfs-mode id="${row}[mode]"/>
+                    <et2-vfs-uid id="${row}[uid]" noLang="1"></et2-vfs-uid>
+                    <et2-vfs-gid id="${row}[gid]" noLang="1"></et2-vfs-gid>
+                    <et2-description id="${row}[comment]"></et2-description>
+                    <customfields-list id="$row" class="customfields"/>
+                    <et2-link-string entryId="${row_cont[path]}" application="filemanager"
+                                     onlyApp="kanban"></et2-link-string>
+                </row>
 			</rows>
 		</grid>
 	</template>
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 565cf836e9..27d4c13e00 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -16,6 +16,7 @@
 				<column width="120"/>
 				<column width="45%"/>
 				<column width="15%" disabled="@no_customfields"/>
+                <column width="120"/>
 				<column/>
 				<column width="120"/>
 				<column/>
@@ -51,6 +52,7 @@
 						</rows>
 					</grid>
 					<nextmatch-customfields id="customfields" app="infolog"/>
+                    <nextmatch-header label="Kanban"/>
 					<nextmatch-header label="Category" id="cat_id"/>
 					<et2-vbox>
 						<nextmatch-sortheader label="Startdate" id="info_startdate" sortmode="DESC"/>
@@ -81,26 +83,36 @@
 					</et2-hbox>
 					<et2-vbox  class="infolog_fullWidth">
 						<et2-link  label="%s $row_cont[info_addr]" id="${row}[info_link]" app=""></et2-link>
-						<et2-hbox>
-							<et2-description  id="${row}[info_subject]" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="85%" noLang="1"></et2-description>
-							<et2-description  align="right" id="{$row}[info_number]" class="infolog_infoId" noLang="1"></et2-description>
-						</et2-hbox>
-						<et2-box  class="infoDes">
-							<et2-description  id="${row}[info_des]" noLang="1" activateLinks="1"></et2-description>
-						</et2-box>
-						<et2-link-string  id="${row}[filelinks]"></et2-link-string>
-					</et2-vbox>
-					<customfields-list id="$row" class="customfields" app="infolog"/>
-					<et2-select-cat  id="${row}[info_cat]" readonly="true"></et2-select-cat>
-					<et2-vbox>
-						<et2-date-time  id="${row}[info_startdate]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
-						<et2-date-time  id="${row}[info_enddate]" readonly="true" class="$row_cont[end_class] infolog_fixedHeight"></et2-date-time>
-						<et2-date-time  id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"></et2-date-time>
-					</et2-vbox>
-					<et2-vbox>
-						<et2-hbox>
-							<et2-date-duration  id="${row}[info_used_time]" readonly="true" disabled="!$row_cont[info_used_time]" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
-                            <et2-date-duration  id="${row}[info_sum_timesheets]" readonly="true" class="timesheet" selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
+                        <et2-hbox>
+                            <et2-description id="${row}[info_subject]" class="$row_cont[sub_class] et2_ellipsis"
+                                             overflow="hidden" width="85%" noLang="1"></et2-description>
+                            <et2-description align="right" id="{$row}[info_number]" class="infolog_infoId"
+                                             noLang="1"></et2-description>
+                        </et2-hbox>
+                        <et2-box class="infoDes">
+                            <et2-description id="${row}[info_des]" noLang="1" activateLinks="1"></et2-description>
+                        </et2-box>
+                        <et2-link-string id="${row}[filelinks]"></et2-link-string>
+                    </et2-vbox>
+                    <customfields-list id="$row" class="customfields" app="infolog"/>
+                    <et2-link-string entryId="${row_cont[info_id]}" application="infolog"
+                                     onlyApp="kanban"></et2-link-string>
+                    <et2-select-cat id="${row}[info_cat]" readonly="true"></et2-select-cat>
+                    <et2-vbox>
+                        <et2-date-time id="${row}[info_startdate]" readonly="true"
+                                       class="infolog_fixedHeight"></et2-date-time>
+                        <et2-date-time id="${row}[info_enddate]" readonly="true"
+                                       class="$row_cont[end_class] infolog_fixedHeight"></et2-date-time>
+                        <et2-date-time id="${row}[info_datecompleted]" readonly="true"
+                                       class="infolog_fixedHeight"></et2-date-time>
+                    </et2-vbox>
+                    <et2-vbox>
+                        <et2-hbox>
+                            <et2-date-duration id="${row}[info_used_time]" readonly="true"
+                                               disabled="!$row_cont[info_used_time]" selectUnit="true"
+                                               displayFormat="@@duration_format"></et2-date-duration>
+                            <et2-date-duration id="${row}[info_sum_timesheets]" readonly="true" class="timesheet"
+                                               selectUnit="true" displayFormat="@@duration_format"></et2-date-duration>
  						</et2-hbox>
                         <et2-date-duration  id="${row}[info_planned_time]" readonly="true" span="all" class="infolog_planned" displayFormat="@@duration_format" selectUnit="true"></et2-date-duration>
 					</et2-vbox>
diff --git a/resources/templates/default/show.xet b/resources/templates/default/show.xet
index a310dbadbb..0ab038eedb 100644
--- a/resources/templates/default/show.xet
+++ b/resources/templates/default/show.xet
@@ -12,6 +12,7 @@
                 <column width="15%"/>
                 <column width="15%"/>
                 <column width="15%" disabled="@no_customfields"/>
+                <column width="120"/>
             </columns>
 			<rows>
 				<row class="th">
@@ -36,6 +37,7 @@
                     <nextmatch-sortheader label="Inventory Number" id="inventory_number"/>
 					<nextmatch-header label="Resource / Accessories"/>
 					<nextmatch-customfields id="customfields"/>
+                    <nextmatch-header label="Kanban"/>
 				</row>
 				<row class="$row_cont[class]">
 					<et2-image-expose  id="${row}[picture_thumb]" href="$row_cont[picture_original]" src="$row_cont[picture_thumb]" class="thumbnailImage"></et2-image-expose>
@@ -61,17 +63,21 @@
 						<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[accessory_of]" id="${row}[accessory_of_label]" extraLinkPopup="850x600" noLang="1"></et2-description>
 						<grid width="100%" id="${row}[accessories]">
 							<columns>
-								<column/>
-							</columns>
-							<rows>
-								<row>
-									<et2-description  href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]" id="${row}[name]" extraLinkPopup="850x600" noLang="1"></et2-description>
-								</row>
-							</rows>
-						</grid>
-					</et2-vbox>
-					<customfields-list id="$row"/>
-				</row>
+                                <column/>
+                            </columns>
+                            <rows>
+                                <row>
+                                    <et2-description href="resources.resources_ui.edit&amp;res_id=$row_cont[acc_id]"
+                                                     id="${row}[name]" extraLinkPopup="850x600"
+                                                     noLang="1"></et2-description>
+                                </row>
+                            </rows>
+                        </grid>
+                    </et2-vbox>
+                    <customfields-list id="$row"/>
+                    <et2-link-string entryId="${row_cont[res_id]}" application="resources"
+                                     onlyApp="kanban"></et2-link-string>
+                </row>
 			</rows>
 		</grid>
 	</template>
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index a32a7c63b8..58aa21db89 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -27,6 +27,7 @@
 				<column width="50"/>
 				<column width="10%" disabled="@no_ts_status"/>
 				<column width="15%"/>
+                <column width="120"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -69,6 +70,7 @@
 					<nextmatch-sortheader label="ID" id="ts_id"/>
 					<et2-nextmatch-header-filter  id="ts_status" emptyLabel="Status"/>
 					<nextmatch-customfields id="customfields"/>
+                    <nextmatch-header label="Kanban"/>
 				</row>
 				<row class="$row_cont[cat_id] $row_cont[class]">
                     <et2-date-time  id="${row}[ts_start]" readonly="true" ></et2-date-time>
@@ -77,16 +79,20 @@
                         <et2-description  id="${row}[ts_title]" class="ts_title $row_cont[titleClass]" noLang="1"></et2-description>
                         <et2-description  id="${row}[ts_description]" class="ts_description" noLang="1"></et2-description>
                     </et2-vbox>
-                    <et2-select-cat  class="noWrap" id="${row}[cat_id]" readonly="true"></et2-select-cat>
-                    <et2-date-duration  id="${row}[ts_duration]" readonly="true" align="right" displayFormat="hm" selectUnit="false"></et2-date-duration>
-                    <et2-number  id="${row}[ts_quantity]" readonly="true" precision="3" noLang="1"></et2-number>
-                    <et2-description  id="${row}[ts_unitprice]" noLang="1"></et2-description>
-                    <et2-number  id="${row}[ts_total]" readonly="true" precision="2" noLang="1"></et2-number>
-                    <et2-select-account  class="$cont[ownerClass]" id="${row}[ts_owner]" readonly="true"></et2-select-account>
-                    <et2-date-time  id="${row}[ts_created]" readonly="true"></et2-date-time>
-                    <et2-description  id="${row}[ts_id]"></et2-description>
-                    <et2-select  id="${row}[ts_status]" readonly="true"></et2-select>
+                    <et2-select-cat class="noWrap" id="${row}[cat_id]" readonly="true"></et2-select-cat>
+                    <et2-date-duration id="${row}[ts_duration]" readonly="true" align="right" displayFormat="hm"
+                                       selectUnit="false"></et2-date-duration>
+                    <et2-number id="${row}[ts_quantity]" readonly="true" precision="3" noLang="1"></et2-number>
+                    <et2-description id="${row}[ts_unitprice]" noLang="1"></et2-description>
+                    <et2-number id="${row}[ts_total]" readonly="true" precision="2" noLang="1"></et2-number>
+                    <et2-select-account class="$cont[ownerClass]" id="${row}[ts_owner]"
+                                        readonly="true"></et2-select-account>
+                    <et2-date-time id="${row}[ts_created]" readonly="true"></et2-date-time>
+                    <et2-description id="${row}[ts_id]"></et2-description>
+                    <et2-select id="${row}[ts_status]" readonly="true"></et2-select>
                     <customfields-list id="$row" readonly="true"/>
+                    <et2-link-string entryId="${row_cont[ts_id]}" application="timesheet"
+                                     onlyApp="kanban"></et2-link-string>
                 </row>
 			</rows>
 		</grid>