From a5f7b7fa9ce97b52ca91e817d84fa576ba959720 Mon Sep 17 00:00:00 2001 From: ssteeltm Date: Fri, 28 Mar 2025 12:00:48 -0300 Subject: [PATCH 01/16] fix: missing kanban ticket settings --- admin_settings_ticket.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/admin_settings_ticket.php b/admin_settings_ticket.php index 2d6d4efd..f91cd4c4 100644 --- a/admin_settings_ticket.php +++ b/admin_settings_ticket.php @@ -72,6 +72,31 @@ require_once "includes/inc_all_admin.php"; + +
+ +
+
+ +
+ +
+
+
+ +
+ value="1" id="ticketOrderingSwitch"> + +
+
+ value="1" id="ticketMovingColumnsSwitch"> + +
+
From b35665863553dd35c4c7415747a1c4bb57795c24 Mon Sep 17 00:00:00 2001 From: Tamir Slobodskoy Date: Tue, 8 Apr 2025 05:02:46 +0100 Subject: [PATCH 02/16] Fix Dashboard following DB Update 1.9.7 --- dashboard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard.php b/dashboard.php index f4b968ad..58b854bf 100644 --- a/dashboard.php +++ b/dashboard.php @@ -151,7 +151,7 @@ if ($user_config_dashboard_financial_enable == 1) { $row = mysqli_fetch_array($sql_unbilled_tickets); $unbilled_tickets = intval($row['unbilled_tickets']); } else { - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(recurring_id) AS recurring_invoices_added FROM recurring WHERE YEAR(recurring_created_at) = $year")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(recurring_invoice_id) AS recurring_invoices_added FROM recurring_invoices WHERE YEAR(recurring_invoice_created_at) = $year")); $recurring_invoices_added = intval($row['recurring_invoices_added']); } From d413e0c8ff1c2ffe2f5408874ab8dcdbe469ee9a Mon Sep 17 00:00:00 2001 From: Tamir Slobodskoy Date: Tue, 8 Apr 2025 05:27:56 +0100 Subject: [PATCH 03/16] Fix Copy Trip Modal --- ajax/ajax_trip_copy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ajax/ajax_trip_copy.php b/ajax/ajax_trip_copy.php index 8865b81b..3eddd5a0 100644 --- a/ajax/ajax_trip_copy.php +++ b/ajax/ajax_trip_copy.php @@ -115,7 +115,7 @@ ob_start(); $sql_users = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id - WHERE user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + WHERE user_role_id > 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); while ($row = mysqli_fetch_array($sql_users)) { $user_id_select = intval($row['user_id']); From 8d0da7b55bd044d073af48e29e7047edfe7afa90 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 9 Apr 2025 14:00:51 -0400 Subject: [PATCH 04/16] Fix Entity Linking in Asset and contact details --- modals/asset_link_credential_modal.php | 2 +- modals/asset_link_document_modal.php | 2 +- modals/asset_link_file_modal.php | 2 +- modals/asset_link_service_modal.php | 2 +- modals/asset_link_software_modal.php | 2 +- modals/contact_link_asset_modal.php | 2 +- modals/contact_link_credential_modal.php | 2 +- modals/contact_link_document_modal.php | 2 +- modals/contact_link_file_modal.php | 2 +- modals/contact_link_service_modal.php | 2 +- modals/contact_link_software_modal.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modals/asset_link_credential_modal.php b/modals/asset_link_credential_modal.php index 748133d2..8a1ca42b 100644 --- a/modals/asset_link_credential_modal.php +++ b/modals/asset_link_credential_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_document_modal.php b/modals/asset_link_document_modal.php index 63ffa0a4..52c6eb5d 100644 --- a/modals/asset_link_document_modal.php +++ b/modals/asset_link_document_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_file_modal.php b/modals/asset_link_file_modal.php index 09b4a1e1..3c8f7e1f 100644 --- a/modals/asset_link_file_modal.php +++ b/modals/asset_link_file_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_service_modal.php b/modals/asset_link_service_modal.php index 7b86bb19..89f55ece 100644 --- a/modals/asset_link_service_modal.php +++ b/modals/asset_link_service_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_software_modal.php b/modals/asset_link_software_modal.php index 1af3fbf8..747d177e 100644 --- a/modals/asset_link_software_modal.php +++ b/modals/asset_link_software_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_asset_modal.php b/modals/contact_link_asset_modal.php index 698b9ea5..2d957ad2 100644 --- a/modals/contact_link_asset_modal.php +++ b/modals/contact_link_asset_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_credential_modal.php b/modals/contact_link_credential_modal.php index daf0cd6b..fb5e41c0 100644 --- a/modals/contact_link_credential_modal.php +++ b/modals/contact_link_credential_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_document_modal.php b/modals/contact_link_document_modal.php index 266a545f..26973df7 100644 --- a/modals/contact_link_document_modal.php +++ b/modals/contact_link_document_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_file_modal.php b/modals/contact_link_file_modal.php index 0f134cc3..e8cf363f 100644 --- a/modals/contact_link_file_modal.php +++ b/modals/contact_link_file_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_service_modal.php b/modals/contact_link_service_modal.php index 74a4b51d..a65ecffd 100644 --- a/modals/contact_link_service_modal.php +++ b/modals/contact_link_service_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_software_modal.php b/modals/contact_link_software_modal.php index b79014dd..0afc59d4 100644 --- a/modals/contact_link_software_modal.php +++ b/modals/contact_link_software_modal.php @@ -8,7 +8,7 @@
- +
From a1957747269406a4ed1908c22a8df19254853ffa Mon Sep 17 00:00:00 2001 From: wrongecho <32306651+wrongecho@users.noreply.github.com> Date: Fri, 11 Apr 2025 14:31:01 +0100 Subject: [PATCH 05/16] Update README.md Add JetBrains to sponsors, as they provide FOSS licenses of PhpStorm to us --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4863620d..d5c52ebe 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,7 @@ If you want to improve ITFlow, feel free to fork the repo and create a pull requ We’re incredibly grateful to the organizations and individuals who support the project - a big thank you to: - CompuMatter - F1 for HELP +- JetBrains (PhpStorm) ## License ITFlow is distributed "as is" under the GPL License, WITHOUT WARRANTY OF ANY KIND. See [`LICENSE`](https://github.com/itflow-org/itflow/blob/master/LICENSE) for details. From 7a5a607ff6b12873e2e2b6f9b2b5d85fb9080441 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Fri, 11 Apr 2025 14:53:02 +0100 Subject: [PATCH 06/16] Redirect the blank index page to the start page --- index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index ab0d6145..fa9c67b1 100644 --- a/index.php +++ b/index.php @@ -14,7 +14,11 @@ if (file_exists("config.php")) {

Blank Page

- + + Date: Sat, 12 Apr 2025 11:58:32 -0400 Subject: [PATCH 07/16] Fix Mobile Country Code in contact list --- contacts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contacts.php b/contacts.php index c6c657e9..53b49e80 100644 --- a/contacts.php +++ b/contacts.php @@ -319,7 +319,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } else { $contact_phone_display = ""; } - $contact_mobile_country_code = nullable_htmlentities($row['contact_phone_country_code']); + $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); if (empty($contact_mobile)) { $contact_mobile_display = ""; From 424104bb66135d2d2dc132c4f9a07bfb7bfb123b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 12 Apr 2025 12:08:30 -0400 Subject: [PATCH 08/16] Default Date between max date to 9999-12-31 instead of current date for filtered listings, this fixes the issue if you post date an entity it would not show in the listing by default unless you selected a a great to date in the filter --- includes/filter_header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/filter_header.php b/includes/filter_header.php index 077fa95d..08e0cd39 100644 --- a/includes/filter_header.php +++ b/includes/filter_header.php @@ -100,7 +100,7 @@ if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) { $dtt = date('Y-m-d', strtotime("last day of december last year")); } else { $dtf = "NULL"; - $dtt = date('Y-m-d'); + $dtt = '9999-12-31'; } // Archived From 3e708059c6e38418160ff5442705e0720a909ab3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 13 Apr 2025 11:55:14 -0400 Subject: [PATCH 09/16] Fix not showing File folders instead of Document Folders when creating a document. --- functions.php | 11 +++++++---- modals/client_file_upload_modal.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/functions.php b/functions.php index e114a877..5d09ed67 100644 --- a/functions.php +++ b/functions.php @@ -1614,10 +1614,12 @@ function getFieldById($table, $id, $field, $escape_method = 'sql') { } // Recursive function to display folder options - Used in folders files and documents -function display_folder_options($parent_folder_id, $client_id, $indent = 0) { +function display_folder_options($parent_folder_id, $client_id, $folder_location = 0, $indent = 0) { global $mysqli; - $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC"); + $folder_location = intval($folder_location); + + $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC"); while ($row = mysqli_fetch_array($sql_folders)) { $folder_id = intval($row['folder_id']); $folder_name = nullable_htmlentities($row['folder_name']); @@ -1627,13 +1629,14 @@ function display_folder_options($parent_folder_id, $client_id, $indent = 0) { // Check if this folder is selected $selected = ''; - if ((isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) || (isset($_POST['folder']) && $_POST['folder'] == $folder_id)) { + if ((isset($_GET['folder_id']) && intval($_GET['folder_id']) === $folder_id) || + (isset($_POST['folder']) && intval($_POST['folder']) === $folder_id)) { $selected = 'selected'; } echo ""; // Recursively display subfolders - display_folder_options($folder_id, $client_id, $indent + 1); + display_folder_options($folder_id, $client_id, $folder_location, $indent + 1); } } \ No newline at end of file diff --git a/modals/client_file_upload_modal.php b/modals/client_file_upload_modal.php index 313c1cda..f0bcc73a 100644 --- a/modals/client_file_upload_modal.php +++ b/modals/client_file_upload_modal.php @@ -37,7 +37,7 @@
From 60fe02bb4792f2238e3bb8d07a6f2d567fe8488d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 13 Apr 2025 11:57:26 -0400 Subject: [PATCH 10/16] Comment --- functions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/functions.php b/functions.php index 5d09ed67..671acedf 100644 --- a/functions.php +++ b/functions.php @@ -1618,6 +1618,8 @@ function display_folder_options($parent_folder_id, $client_id, $folder_location global $mysqli; $folder_location = intval($folder_location); + // 0 = Document Folders + // 1 = File Folders $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC"); while ($row = mysqli_fetch_array($sql_folders)) { From 19b809b699ee33c73a109bb40157038365df2eff Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 13 Apr 2025 13:29:16 -0400 Subject: [PATCH 11/16] Added SortableJS Library, and updated Invoice, Quote and Recurring to use it. Added Grab Bar Icons next to action buttons. Will now sort in Mobile much more efficiently, update ajax vars for recurring invoice --- ajax.php | 4 +- css/itflow_custom.css | 13 +++-- invoice.php | 86 ++++++++++++++--------------- plugins/SortableJS/Sortable.min.js | 2 + quote.php | 89 ++++++++++++++---------------- recurring_invoice.php | 86 +++++++++++++---------------- 6 files changed, 132 insertions(+), 148 deletions(-) create mode 100644 plugins/SortableJS/Sortable.min.js diff --git a/ajax.php b/ajax.php index 7e046691..dada6372 100644 --- a/ajax.php +++ b/ajax.php @@ -586,13 +586,13 @@ if (isset($_POST['update_recurring_invoice_items_order'])) { enforceUserPermission('module_sales', 2); $positions = $_POST['positions']; - $recurring_id = intval($_POST['recurring_id']); + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); foreach ($positions as $position) { $id = intval($position['id']); $order = intval($position['order']); - mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_recurring_id = $recurring_id AND item_id = $id"); + mysqli_query($mysqli, "UPDATE invoice_items SET item_order = $order WHERE item_recurring_invoice_id = $recurring_invoice_id AND item_id = $id"); } // return a response diff --git a/css/itflow_custom.css b/css/itflow_custom.css index 7bb00c94..2107c891 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -20,10 +20,11 @@ } } -.grab-cursor { - cursor: grab; -} - -.grab-cursor:active { - cursor: grabbing; +button.drag-handle { + cursor: grab !important; + touch-action: none; + user-select: none; } +button.drag-handle:active { + cursor: grabbing !important; +} \ No newline at end of file diff --git a/invoice.php b/invoice.php index 63c60dd8..bf1ffb35 100644 --- a/invoice.php +++ b/invoice.php @@ -165,6 +165,7 @@ if (isset($_GET['invoice_id'])) { ?> +
    @@ -381,26 +382,34 @@ if (isset($_GET['invoice_id'])) { -
    - -
    - - Edit - -
    - Delete +
    +
    + +
    +
    +
    + +
    + + Edit + +
    + Delete +
    +
    - - + @@ -1178,38 +1187,23 @@ require_once "includes/footer.php"; } - + diff --git a/plugins/SortableJS/Sortable.min.js b/plugins/SortableJS/Sortable.min.js new file mode 100644 index 00000000..95423a64 --- /dev/null +++ b/plugins/SortableJS/Sortable.min.js @@ -0,0 +1,2 @@ +/*! Sortable 1.15.6 - MIT | git://github.com/SortableJS/Sortable.git */ +!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function e(e,t){var n,o=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,n)),o}function I(o){for(var t=1;tt.length)&&(e=t.length);for(var n=0,o=new Array(e);n"===e[0]&&(e=e.substring(1)),t))try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return}}function g(t){return t.host&&t!==document&&t.host.nodeType?t.host:t.parentNode}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"!==e[0]||t.parentNode===n)&&f(t,e)||o&&t===n)return t}while(t!==n&&(t=g(t)))}return null}var m,v=/\s+/g;function k(t,e,n){var o;t&&e&&(t.classList?t.classList[n?"add":"remove"](e):(o=(" "+t.className+" ").replace(v," ").replace(" "+e+" "," "),t.className=(o+(n?" "+e:"")).replace(v," ")))}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];o[e=!(e in o||-1!==e.indexOf("webkit"))?"-webkit-"+e:e]=n+("string"==typeof n?"":"px")}}function b(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform")}while(o&&"none"!==o&&(n=o+" "+n),!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function D(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i=n.left-e&&i<=n.right+e,e=r>=n.top-e&&r<=n.bottom+e;return o&&e?a=t:void 0}}),a);if(e){var n,o={};for(n in t)t.hasOwnProperty(n)&&(o[n]=t[n]);o.target=o.rootEl=e,o.preventDefault=void 0,o.stopPropagation=void 0,e[K]._onDragOver(o)}}var i,r,a}function Ft(t){Z&&Z.parentNode[K]._isOutsideThisEl(t.target)}function jt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[K]=this;var n,o,i={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return kt(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==jt.supportPointer&&"PointerEvent"in window&&(!u||c),emptyInsertThreshold:5};for(n in z.initializePlugins(this,t,i),i)n in e||(e[n]=i[n]);for(o in Rt(e),this)"_"===o.charAt(0)&&"function"==typeof this[o]&&(this[o]=this[o].bind(this));this.nativeDraggable=!e.forceFallback&&It,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?h(t,"pointerdown",this._onTapStart):(h(t,"mousedown",this._onTapStart),h(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(h(t,"dragover",this),h(t,"dragenter",this)),St.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,A())}function Ht(t,e,n,o,i,r,a,l){var s,c,u=t[K],d=u.options.onMove;return!window.CustomEvent||y||w?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),c=d?d.call(u,s,a):c}function Lt(t){t.draggable=!1}function Kt(){xt=!1}function Wt(t){return setTimeout(t,0)}function zt(t){return clearTimeout(t)}jt.prototype={constructor:jt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(vt=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,Z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(!function(t){Ot.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&Ot.push(o)}}(o),!Z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=P(l,t.draggable,o,!1))&&l.animated||et===l)){if(it=j(l),at=j(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return V({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),U("filter",n,{evt:e}),void(i&&e.preventDefault())}else if(c=c&&c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return V({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),U("filter",n,{evt:e}),!0}))return void(i&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;n&&!Z&&n.parentNode===r&&(o=X(n),J=r,$=(Z=n).parentNode,tt=Z.nextSibling,et=n,st=a.group,ut={target:jt.dragged=Z,clientX:(e||t).clientX,clientY:(e||t).clientY},ft=ut.clientX-o.left,gt=ut.clientY-o.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,Z.style["will-change"]="all",o=function(){U("delayEnded",i,{evt:t}),jt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!s&&i.nativeDraggable&&(Z.draggable=!0),i._triggerDragStart(t,e),V({sortable:i,name:"choose",originalEvent:t}),k(Z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){D(Z,t.trim(),Lt)}),h(l,"dragover",Bt),h(l,"mousemove",Bt),h(l,"touchmove",Bt),a.supportPointer?(h(l,"pointerup",i._onDrop),this.nativeDraggable||h(l,"pointercancel",i._onDrop)):(h(l,"mouseup",i._onDrop),h(l,"touchend",i._onDrop),h(l,"touchcancel",i._onDrop)),s&&this.nativeDraggable&&(this.options.touchStartThreshold=4,Z.draggable=!0),U("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(w||y)?o():jt.eventCanceled?this._onDrop():(a.supportPointer?(h(l,"pointerup",i._disableDelayedDrag),h(l,"pointercancel",i._disableDelayedDrag)):(h(l,"mouseup",i._disableDelayedDrag),h(l,"touchend",i._disableDelayedDrag),h(l,"touchcancel",i._disableDelayedDrag)),h(l,"mousemove",i._delayedDragTouchMoveHandler),h(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&h(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)))},_delayedDragTouchMoveHandler:function(t){t=t.touches?t.touches[0]:t;Math.max(Math.abs(t.clientX-this._lastX),Math.abs(t.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){Z&&Lt(Z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;p(t,"mouseup",this._disableDelayedDrag),p(t,"touchend",this._disableDelayedDrag),p(t,"touchcancel",this._disableDelayedDrag),p(t,"pointerup",this._disableDelayedDrag),p(t,"pointercancel",this._disableDelayedDrag),p(t,"mousemove",this._delayedDragTouchMoveHandler),p(t,"touchmove",this._delayedDragTouchMoveHandler),p(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?h(document,"pointermove",this._onTouchMove):h(document,e?"touchmove":"mousemove",this._onTouchMove):(h(Z,"dragend",this),h(J,"dragstart",this._onDragStart));try{document.selection?Wt(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){var n;Dt=!1,J&&Z?(U("dragStarted",this,{evt:e}),this.nativeDraggable&&h(document,"dragover",Ft),n=this.options,t||k(Z,n.dragClass,!1),k(Z,n.ghostClass,!0),jt.active=this,t&&this._appendGhost(),V({sortable:this,name:"start",originalEvent:e})):this._nulling()},_emulateDragOver:function(){if(dt){this._lastX=dt.clientX,this._lastY=dt.clientY,Xt();for(var t=document.elementFromPoint(dt.clientX,dt.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(dt.clientX,dt.clientY))!==e;)e=t;if(Z.parentNode[K]._isOutsideThisEl(t),e)do{if(e[K])if(e[K]._onDragOver({clientX:dt.clientX,clientY:dt.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}while(e=g(t=e));Yt()}},_onTouchMove:function(t){if(ut){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=Q&&b(Q,!0),a=Q&&r&&r.a,l=Q&&r&&r.d,e=At&&wt&&E(wt),a=(i.clientX-ut.clientX+o.x)/(a||1)+(e?e[0]-Tt[0]:0)/(a||1),l=(i.clientY-ut.clientY+o.y)/(l||1)+(e?e[1]-Tt[1]:0)/(l||1);if(!jt.active&&!Dt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))E.right+10||S.clientY>x.bottom&&S.clientX>x.left:S.clientY>E.bottom+10||S.clientX>x.right&&S.clientY>x.top)||m.animated)){if(m&&(t=n,e=r,C=X(B((_=this).el,0,_.options,!0)),_=L(_.el,_.options,Q),e?t.clientX<_.left-10||t.clientY = 2) { ?> -
    - -
    - - Edit - -
    - - Delete - +
    +
    + +
    +
    + +
    + +
    + + Edit + +
    + + Delete + +
    +
    - + @@ -992,38 +1002,23 @@ require_once "includes/footer.php"; } - + diff --git a/recurring_invoice.php b/recurring_invoice.php index a510f522..34271cd1 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -272,26 +272,34 @@ if (isset($_GET['recurring_invoice_id'])) { -
    - -
    - - Edit - -
    - Delete - +
    +
    + +
    +
    +
    + +
    + + Edit + +
    + Delete +
    +
    - + @@ -483,39 +491,23 @@ require_once "includes/footer.php"; }); - - + From 65e107d1544defb36db28db5a0a05be6885405ba Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 13 Apr 2025 15:01:52 -0400 Subject: [PATCH 12/16] Totally remove Dragula in Favor of the modern SortableJS library, updated the Kanban --- admin_ticket_template_details.php | 255 ++++++++++++++---------------- css/itflow_custom.css | 8 +- css/tickets_kanban.css | 64 ++++++-- invoice.php | 2 - js/tickets_kanban.js | 246 +++++++++++++--------------- plugins/dragula/dragula.min.css | 1 - plugins/dragula/dragula.min.js | 1 - quote.php | 1 - ticket.php | 64 +++----- tickets_kanban.php | 5 +- 10 files changed, 314 insertions(+), 333 deletions(-) delete mode 100644 plugins/dragula/dragula.min.css delete mode 100644 plugins/dragula/dragula.min.js diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php index 03ad6fa0..b8280aed 100644 --- a/admin_ticket_template_details.php +++ b/admin_ticket_template_details.php @@ -30,156 +30,139 @@ $ticket_template_updated_at = nullable_htmlentities($row['ticket_template_update $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id ORDER BY task_template_order ASC, task_template_id ASC"); ?> - -
      -
    1. - Home -
      2. -
    2. - Admin -
      3. -
    3. - Ticket Templates -
      4. -
      5. -
    +
      +
    1. + Home +
      2. +
    2. + Admin +
      3. +
    3. + Ticket Templates +
      4. +
      5. +
    -
    -
    +
    +
    -
    -
    -

    -
    - -
    -

    -
    -
    +
    +
    +

    +
    + +
    +

    +
    -

    -
    -
    -
    -
    -
    - +

    +
    +
    - -
    - -
    - -
    -
    -
    Tasks
    -
    -
    - - -
    -
    -
    - -
    - -
    - -
    -
    -
    - - - - - - - - - -
    - - m - - - - -
    -
    - -
    - - Edit - -
    - - Delete - -
    -
    -
    -
    -
    +
    +
    +
    -
    - - - + ?> + +
    +
    + +
    + +
    + + + + + - -
    1. diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js index 419a0ee3..c614d057 100644 --- a/js/tickets_kanban.js +++ b/js/tickets_kanban.js @@ -1,146 +1,126 @@ -$(document).ready(function() { - console.log('CONFIG_TICKET_MOVING_COLUMNS: ' + CONFIG_TICKET_MOVING_COLUMNS); - console.log('CONFIG_TICKET_ORDERING: ' + CONFIG_TICKET_ORDERING); +$(document).ready(function () { + console.log('CONFIG_TICKET_MOVING_COLUMNS:', CONFIG_TICKET_MOVING_COLUMNS); + console.log('CONFIG_TICKET_ORDERING:', CONFIG_TICKET_ORDERING); - // Function to detect touch devices - function isTouchDevice() { - return 'ontouchstart' in window || navigator.maxTouchPoints; - } - - // Initialize Dragula for the Kanban board - let boardDrake = dragula([ - document.querySelector('#kanban-board') - ], { - moves: function(el, container, handle) { - return handle.classList.contains('panel-title'); - }, - accepts: function(el, target, source, sibling) { - return CONFIG_TICKET_MOVING_COLUMNS === 1; - } - }); - - // Log the event of moving the column panel-title - boardDrake.on('drag', function(el) { - //console.log('Dragging column:', el.querySelector('.panel-title').innerText); - }); - - boardDrake.on('drop', function(el, target, source, sibling) { - //console.log('Dropped column:', el.querySelector('.panel-title').innerText); - - // Get all columns and their positions - let columns = document.querySelectorAll('#kanban-board .kanban-column'); - let columnPositions = []; - - columns.forEach(function(column, index) { - let statusId = $(column).data('status-id'); // Assuming you have a data attribute for status ID - columnPositions.push({ - status_id: statusId, + // ------------------------------- + // Drag: Kanban Columns (Statuses) + // ------------------------------- + new Sortable(document.querySelector('#kanban-board'), { + animation: 150, + handle: '.panel-title', + draggable: '.kanban-column', + onEnd: function () { + const columnPositions = Array.from(document.querySelectorAll('#kanban-board .kanban-column')).map((col, index) => ({ + status_id: $(col).data('status-id'), status_kanban: index - }); - }); + })); - // Send AJAX request to update all column positions - $.ajax({ - url: 'ajax.php', - type: 'POST', - data: { - update_kanban_status_position: true, - positions: columnPositions - }, - success: function(response) { - console.log('Ticket status kanban orders updated successfully.'); - // Optionally, you can refresh the page or update the UI here - }, - error: function(xhr, status, error) { - console.error('Error updating ticket status kanban orders:', error); - } - }); - }); - - // Initialize Dragula for the Kanban Cards - let drake = dragula([ - ...document.querySelectorAll('#status') - ], { - moves: function(el, container, handle) { - if (isTouchDevice()) { - return handle.classList.contains('drag-handle-class'); - } else { - return true; // Allow dragging on the entire task element for desktop + if (CONFIG_TICKET_MOVING_COLUMNS === 1) { + $.post('ajax.php', { + update_kanban_status_position: true, + positions: columnPositions + }).done(() => { + console.log('Ticket status kanban orders updated.'); + }).fail((xhr) => { + console.error('Error updating status order:', xhr.responseText); + }); } } }); + // ------------------------------- + // Drag: Tasks within Columns + // ------------------------------- + document.querySelectorAll('.kanban-status').forEach(statusCol => { + new Sortable(statusCol, { + group: 'tickets', + animation: 150, + handle: isTouchDevice() ? '.drag-handle-class' : undefined, + onStart: () => hidePlaceholders(), + onEnd: function (evt) { + const target = evt.to; + const movedEl = evt.item; + + // Disallow reordering in same column if config says so + if (CONFIG_TICKET_ORDERING === 0 && evt.from === evt.to) { + evt.from.insertBefore(movedEl, evt.from.children[evt.oldIndex]); + showPlaceholders(); + return; + } + + const columnId = $(target).data('status-id'); + + const positions = Array.from(target.querySelectorAll('.task')).map((card, index) => { + const ticketId = $(card).data('ticket-id'); + const oldStatus = ticketId === $(movedEl).data('ticket-id') + ? $(movedEl).data('ticket-status-id') + : false; + + $(card).data('ticket-status-id', columnId); // update DOM + + return { + ticket_id: ticketId, + ticket_order: index, + ticket_oldStatus: oldStatus, + ticket_status: columnId + }; + }); + + $.post('ajax.php', { + update_kanban_ticket: true, + positions: positions + }).done(() => { + console.log('Updated kanban ticket positions.'); + }).fail((xhr) => { + console.error('Error updating ticket positions:', xhr.responseText); + }); + + // Refresh placeholders after update + showPlaceholders(); + } + }); + }); + + // ------------------------------- + // 📱 Touch Support: Show drag handle on mobile + // ------------------------------- if (isTouchDevice()) { - const moveList = document.querySelectorAll('.task'); - moveList.forEach(task => { - task.querySelector('.drag-handle-class').style.display = 'inline'; + $('.drag-handle-class').css('display', 'inline'); + } + + // ------------------------------- + // Placeholder Management + // ------------------------------- + function showPlaceholders() { + document.querySelectorAll('.kanban-status').forEach(status => { + const placeholderClass = 'empty-placeholder'; + + // Remove existing placeholder + const existing = status.querySelector(`.${placeholderClass}`); + if (existing) existing.remove(); + + // Only show if there are no tasks + if (status.querySelectorAll('.task').length === 0) { + const placeholder = document.createElement('div'); + placeholder.className = `${placeholderClass} text-muted text-center p-2`; + placeholder.innerText = 'Drop ticket here'; + placeholder.style.pointerEvents = 'none'; + status.appendChild(placeholder); + } }); } - drake.on('drag', function(el) { - el.style.cursor = 'grabbing'; - }); - - drake.on('dragend', function(el) { - el.style.cursor = 'grab'; - }); - // Add event listener for the drop event - drake.on('drop', function (el, target, source, sibling) { - // Log the target ID to the console - //console.log('Dropped into:', target.getAttribute('data-column-name')); + function hidePlaceholders() { + document.querySelectorAll('.empty-placeholder').forEach(el => el.remove()); + } - if (CONFIG_TICKET_ORDERING === 0 && source == target) { - drake.cancel(true); // Move the card back to its original position - return; - } - - // Get all cards in the target column and their positions - let cards = $(target).children('.task'); - let positions = []; + // Run once on load + showPlaceholders(); - //id of current status / column - let columnId = $(target).data('status-id'); - - let movedTicketId = $(el).data('ticket-id'); - let movedTicketStatusId = $(el).data('ticket-status-id'); - - cards.each(function(index, card) { - let ticketId = $(card).data('ticket-id'); - let statusId = $(card).data('ticket-status-id'); - - let oldStatus = false; - if (ticketId == movedTicketId) { - oldStatus = movedTicketStatusId; - } - - //update the status id of the card if needed - if (statusId != columnId) { - $(card).data('ticket-status-id', columnId); - statusId = columnId; - } - positions.push({ - ticket_id: ticketId, - ticket_order: index, - ticket_oldStatus: oldStatus, - ticket_status: statusId ?? null// Get the new status ID from the target column - }); - }); - - //console.log(positions); - // Send AJAX request to update all ticket kanban orders and statuses - $.ajax({ - url: 'ajax.php', - type: 'POST', - data: { - update_kanban_ticket: true, - positions: positions - }, - success: function(response) { - //console.log('Ticket kanban orders and statuses updated successfully.'); - }, - error: function(xhr, status, error) { - console.error('Error updating ticket kanban orders and statuses:', error); - } - }); - }); -}); \ No newline at end of file + // ------------------------------- + // Utility: Detect touch device + // ------------------------------- + function isTouchDevice() { + return 'ontouchstart' in window || navigator.maxTouchPoints > 0; + } +}); diff --git a/plugins/dragula/dragula.min.css b/plugins/dragula/dragula.min.css deleted file mode 100644 index a080100e..00000000 --- a/plugins/dragula/dragula.min.css +++ /dev/null @@ -1 +0,0 @@ -.gu-mirror{position:fixed!important;margin:0!important;z-index:9999!important;opacity:.8}.gu-hide{display:none!important}.gu-unselectable{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}.gu-transit{opacity:.2} \ No newline at end of file diff --git a/plugins/dragula/dragula.min.js b/plugins/dragula/dragula.min.js deleted file mode 100644 index dd61cd87..00000000 --- a/plugins/dragula/dragula.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).dragula=e()}(function(){return function o(r,i,u){function c(t,e){if(!i[t]){if(!r[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(a)return a(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=i[t]={exports:{}},r[t][0].call(n.exports,function(e){return c(r[t][1][e]||e)},n,n.exports,o,r,i,u)}return i[t].exports}for(var a="function"==typeof require&&require,e=0;ee.left+G(e)/2);return n(u>e.top+J(e)/2)}:function(){var e,t,n,o=r.children.length;for(e=0;ei)return t;if(!c&&n.top+n.height/2>u)return t}return null})();function n(e){return e?Z(t):t}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./classes":1,"contra/emitter":5,crossvent:6}],3:[function(e,t,n){t.exports=function(e,t){return Array.prototype.slice.call(e,t)}},{}],4:[function(e,t,n){"use strict";var o=e("ticky");t.exports=function(e,t,n){e&&o(function(){e.apply(n||null,t||[])})}},{ticky:10}],5:[function(e,t,n){"use strict";var c=e("atoa"),a=e("./debounce");t.exports=function(r,e){var i=e||{},u={};return void 0===r&&(r={}),r.on=function(e,t){return u[e]?u[e].push(t):u[e]=[t],r},r.once=function(e,t){return t._once=!0,r.on(e,t),r},r.off=function(e,t){var n=arguments.length;if(1===n)delete u[e];else if(0===n)u={};else{e=u[e];if(!e)return r;e.splice(e.indexOf(t),1)}return r},r.emit=function(){var e=c(arguments);return r.emitterSnapshot(e.shift()).apply(this,e)},r.emitterSnapshot=function(o){var e=(u[o]||[]).slice(0);return function(){var t=c(arguments),n=this||r;if("error"===o&&!1!==i.throws&&!e.length)throw 1===t.length?t[0]:t;return e.forEach(function(e){i.async?a(e,t,n):e.apply(n,t),e._once&&r.off(o,e)}),r}},r}},{"./debounce":4,atoa:3}],6:[function(n,o,e){(function(r){"use strict";var i=n("custom-event"),u=n("./eventmap"),c=r.document,e=function(e,t,n,o){return e.addEventListener(t,n,o)},t=function(e,t,n,o){return e.removeEventListener(t,n,o)},a=[];function l(e,t,n){t=function(e,t,n){var o,r;for(o=0;o -
        diff --git a/ticket.php b/ticket.php index 3b28d0f2..7f6fbcb5 100644 --- a/ticket.php +++ b/ticket.php @@ -341,7 +341,6 @@ if (isset($_GET['ticket_id'])) { $ticket_collaborators = nullable_htmlentities($row['user_names']); ?> -
          @@ -940,7 +939,7 @@ if (isset($_GET['ticket_id'])) { - +
          @@ -1207,41 +1207,23 @@ require_once "includes/footer.php"; }); - - + diff --git a/tickets_kanban.php b/tickets_kanban.php index b8593bfe..bb4e3ab0 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -1,4 +1,3 @@ -
          name); ?>
          -
          +
          tickets as $item){ if ($item['ticket_priority'] == "High") { @@ -154,5 +153,5 @@ echo "const CONFIG_TICKET_MOVING_COLUMNS = " . json_encode($config_ticket_movi echo "const CONFIG_TICKET_ORDERING = " . json_encode($config_ticket_ordering) . ";"; echo ""; ?> - + \ No newline at end of file From 846947ff49cecb1148f0926b737bc55ca87dadcf Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 13 Apr 2025 15:11:37 -0400 Subject: [PATCH 13/16] Change the button handlebar class --- css/tickets_kanban.css | 60 ++--------- js/tickets_kanban.js | 238 ++++++++++++++++++++++------------------- tickets_kanban.php | 2 +- 3 files changed, 139 insertions(+), 161 deletions(-) diff --git a/css/tickets_kanban.css b/css/tickets_kanban.css index 140c0f9e..a03d6773 100644 --- a/css/tickets_kanban.css +++ b/css/tickets_kanban.css @@ -1,83 +1,41 @@ -/* General Popover Styling */ .popover { max-width: 600px; } - -/* Kanban Board Container */ #kanban-board { display: flex; - overflow-x: auto; box-sizing: border-box; + overflow-x: auto; min-width: 400px; height: calc(100vh - 210px); } -/* Kanban Column */ .kanban-column { - flex: 1; + flex: 1; /* Allows columns to grow equally */ + margin: 0 10px; /* Space between columns */ min-width: 300px; max-width: 300px; - margin: 0 10px; background: #f4f4f4; - border: 1px solid #ccc; - border-radius: 4px; padding: 10px; + border: 1px solid #ccc; min-height: calc(100vh - 230px); max-height: calc(100vh - 230px); box-sizing: border-box; - display: flex; - flex-direction: column; } -/* Column Inner Scrollable Task Area */ -.kanban-status { - flex: 1; - overflow-y: auto; - min-height: 60px; - position: relative; - padding: 5px; - background-color: #f9f9f9; - border-radius: 4px; +.kanban-column div { + max-height: calc(100vh - 280px); /* Set your desired max height */ + overflow-y: auto; /* Adds a scrollbar when content exceeds max height */ } -/* Individual Task Cards */ .task { background: #fff; margin: 5px 0; padding: 10px; border: 1px solid #ddd; - border-radius: 4px; - cursor: grab; - user-select: none; + user-select: none; /* Prevent text selection */ } -/* Grabbing Cursor State */ -.task:active { - cursor: grabbing; -} - -/* Drag Handle (shown on mobile or with class targeting) */ .drag-handle-class { - float: right; touch-action: none; - cursor: grab; -} - -/* Placeholder shown in empty columns */ -.empty-placeholder { - border: 2px dashed #ccc; - background-color: #fcfcfc; - color: #999; - font-style: italic; - padding: 12px; - margin: 10px 0; - text-align: center; - border-radius: 4px; - pointer-events: none; -} - -/* Sortable drop zone feedback (optional visual cue) */ -.kanban-status.sortable-over { - background-color: #eaf6ff; - transition: background-color 0.2s ease; + float: right; } diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js index c614d057..419a0ee3 100644 --- a/js/tickets_kanban.js +++ b/js/tickets_kanban.js @@ -1,126 +1,146 @@ -$(document).ready(function () { - console.log('CONFIG_TICKET_MOVING_COLUMNS:', CONFIG_TICKET_MOVING_COLUMNS); - console.log('CONFIG_TICKET_ORDERING:', CONFIG_TICKET_ORDERING); +$(document).ready(function() { + console.log('CONFIG_TICKET_MOVING_COLUMNS: ' + CONFIG_TICKET_MOVING_COLUMNS); + console.log('CONFIG_TICKET_ORDERING: ' + CONFIG_TICKET_ORDERING); - // ------------------------------- - // Drag: Kanban Columns (Statuses) - // ------------------------------- - new Sortable(document.querySelector('#kanban-board'), { - animation: 150, - handle: '.panel-title', - draggable: '.kanban-column', - onEnd: function () { - const columnPositions = Array.from(document.querySelectorAll('#kanban-board .kanban-column')).map((col, index) => ({ - status_id: $(col).data('status-id'), + // Function to detect touch devices + function isTouchDevice() { + return 'ontouchstart' in window || navigator.maxTouchPoints; + } + + // Initialize Dragula for the Kanban board + let boardDrake = dragula([ + document.querySelector('#kanban-board') + ], { + moves: function(el, container, handle) { + return handle.classList.contains('panel-title'); + }, + accepts: function(el, target, source, sibling) { + return CONFIG_TICKET_MOVING_COLUMNS === 1; + } + }); + + // Log the event of moving the column panel-title + boardDrake.on('drag', function(el) { + //console.log('Dragging column:', el.querySelector('.panel-title').innerText); + }); + + boardDrake.on('drop', function(el, target, source, sibling) { + //console.log('Dropped column:', el.querySelector('.panel-title').innerText); + + // Get all columns and their positions + let columns = document.querySelectorAll('#kanban-board .kanban-column'); + let columnPositions = []; + + columns.forEach(function(column, index) { + let statusId = $(column).data('status-id'); // Assuming you have a data attribute for status ID + columnPositions.push({ + status_id: statusId, status_kanban: index - })); + }); + }); - if (CONFIG_TICKET_MOVING_COLUMNS === 1) { - $.post('ajax.php', { - update_kanban_status_position: true, - positions: columnPositions - }).done(() => { - console.log('Ticket status kanban orders updated.'); - }).fail((xhr) => { - console.error('Error updating status order:', xhr.responseText); - }); + // Send AJAX request to update all column positions + $.ajax({ + url: 'ajax.php', + type: 'POST', + data: { + update_kanban_status_position: true, + positions: columnPositions + }, + success: function(response) { + console.log('Ticket status kanban orders updated successfully.'); + // Optionally, you can refresh the page or update the UI here + }, + error: function(xhr, status, error) { + console.error('Error updating ticket status kanban orders:', error); + } + }); + }); + + // Initialize Dragula for the Kanban Cards + let drake = dragula([ + ...document.querySelectorAll('#status') + ], { + moves: function(el, container, handle) { + if (isTouchDevice()) { + return handle.classList.contains('drag-handle-class'); + } else { + return true; // Allow dragging on the entire task element for desktop } } }); - // ------------------------------- - // Drag: Tasks within Columns - // ------------------------------- - document.querySelectorAll('.kanban-status').forEach(statusCol => { - new Sortable(statusCol, { - group: 'tickets', - animation: 150, - handle: isTouchDevice() ? '.drag-handle-class' : undefined, - onStart: () => hidePlaceholders(), - onEnd: function (evt) { - const target = evt.to; - const movedEl = evt.item; + if (isTouchDevice()) { + const moveList = document.querySelectorAll('.task'); + moveList.forEach(task => { + task.querySelector('.drag-handle-class').style.display = 'inline'; + }); + } - // Disallow reordering in same column if config says so - if (CONFIG_TICKET_ORDERING === 0 && evt.from === evt.to) { - evt.from.insertBefore(movedEl, evt.from.children[evt.oldIndex]); - showPlaceholders(); - return; - } + drake.on('drag', function(el) { + el.style.cursor = 'grabbing'; + }); + + drake.on('dragend', function(el) { + el.style.cursor = 'grab'; + }); + // Add event listener for the drop event + drake.on('drop', function (el, target, source, sibling) { + // Log the target ID to the console + //console.log('Dropped into:', target.getAttribute('data-column-name')); - const columnId = $(target).data('status-id'); + if (CONFIG_TICKET_ORDERING === 0 && source == target) { + drake.cancel(true); // Move the card back to its original position + return; + } + + // Get all cards in the target column and their positions + let cards = $(target).children('.task'); + let positions = []; - const positions = Array.from(target.querySelectorAll('.task')).map((card, index) => { - const ticketId = $(card).data('ticket-id'); - const oldStatus = ticketId === $(movedEl).data('ticket-id') - ? $(movedEl).data('ticket-status-id') - : false; + //id of current status / column + let columnId = $(target).data('status-id'); - $(card).data('ticket-status-id', columnId); // update DOM + let movedTicketId = $(el).data('ticket-id'); + let movedTicketStatusId = $(el).data('ticket-status-id'); - return { - ticket_id: ticketId, - ticket_order: index, - ticket_oldStatus: oldStatus, - ticket_status: columnId - }; - }); + cards.each(function(index, card) { + let ticketId = $(card).data('ticket-id'); + let statusId = $(card).data('ticket-status-id'); + + let oldStatus = false; + if (ticketId == movedTicketId) { + oldStatus = movedTicketStatusId; + } - $.post('ajax.php', { - update_kanban_ticket: true, - positions: positions - }).done(() => { - console.log('Updated kanban ticket positions.'); - }).fail((xhr) => { - console.error('Error updating ticket positions:', xhr.responseText); - }); + //update the status id of the card if needed + if (statusId != columnId) { + $(card).data('ticket-status-id', columnId); + statusId = columnId; + } + positions.push({ + ticket_id: ticketId, + ticket_order: index, + ticket_oldStatus: oldStatus, + ticket_status: statusId ?? null// Get the new status ID from the target column + }); + }); - // Refresh placeholders after update - showPlaceholders(); + //console.log(positions); + // Send AJAX request to update all ticket kanban orders and statuses + $.ajax({ + url: 'ajax.php', + type: 'POST', + data: { + update_kanban_ticket: true, + positions: positions + }, + success: function(response) { + //console.log('Ticket kanban orders and statuses updated successfully.'); + }, + error: function(xhr, status, error) { + console.error('Error updating ticket kanban orders and statuses:', error); } }); }); - - // ------------------------------- - // 📱 Touch Support: Show drag handle on mobile - // ------------------------------- - if (isTouchDevice()) { - $('.drag-handle-class').css('display', 'inline'); - } - - // ------------------------------- - // Placeholder Management - // ------------------------------- - function showPlaceholders() { - document.querySelectorAll('.kanban-status').forEach(status => { - const placeholderClass = 'empty-placeholder'; - - // Remove existing placeholder - const existing = status.querySelector(`.${placeholderClass}`); - if (existing) existing.remove(); - - // Only show if there are no tasks - if (status.querySelectorAll('.task').length === 0) { - const placeholder = document.createElement('div'); - placeholder.className = `${placeholderClass} text-muted text-center p-2`; - placeholder.innerText = 'Drop ticket here'; - placeholder.style.pointerEvents = 'none'; - status.appendChild(placeholder); - } - }); - } - - function hidePlaceholders() { - document.querySelectorAll('.empty-placeholder').forEach(el => el.remove()); - } - - // Run once on load - showPlaceholders(); - - // ------------------------------- - // Utility: Detect touch device - // ------------------------------- - function isTouchDevice() { - return 'ontouchstart' in window || navigator.maxTouchPoints > 0; - } -}); +}); \ No newline at end of file diff --git a/tickets_kanban.php b/tickets_kanban.php index bb4e3ab0..e8b4dd3d 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -105,7 +105,7 @@ $kanban = array_values($statuses); -
          - - m - - - + + m + -
          = 2) { ?> +
          +           		- +
          diff --git a/contacts.php b/contacts.php index 53b49e80..1ef1c912 100644 --- a/contacts.php +++ b/contacts.php @@ -445,11 +445,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
          		- +
          From 923001928cbc17457fc6ac096ff4b240aae234d1 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 18 Apr 2025 18:08:40 -0400 Subject: [PATCH 16/16] Update Changelog and version --- CHANGELOG.md | 13 +++++++++++++ asset_details.php | 4 ++-- includes/app_version.php | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04a0a3ec..75c0a8c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ This file documents all notable changes made to ITFlow. +## [25.03.5] + +### Fixed +- Fixed the user listing issue when copying a trip. +- Corrected the display of recurring invoice amounts on the dashboard. +- Fixed the linking of entities with assets and contacts. +- Resolved the issue with displaying the correct mobile country code in the contact listing. +- Set the default date to `9999-12-31` to ensure future items (like invoices) are displayed by default. +- Fixed the display issue where file folders were not showing properly during document creation. +- Migrated from Dragula to SortableJS for a more modern, mobile-friendly solution. +- Added Handlebars icons for drag-and-drop items. +- Changed behavior to open Contact and Asset Details pages directly instead of using a modal. + ## [25.03.4] ### Fixed diff --git a/asset_details.php b/asset_details.php index b7a03b5d..066f1eec 100644 --- a/asset_details.php +++ b/asset_details.php @@ -244,7 +244,7 @@ if (isset($_GET['asset_id'])) { data-ajax-id=""> -

          +

          asset_photo"> @@ -405,7 +405,7 @@ if (isset($_GET['asset_id'])) {
          -

          Network Interfaces

          +

          Interfaces