polish

public-typescript/workOrderEdit.js

@@ -834,7 +834,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 panelBlockElement.dataset.workOrderMilestoneId =
                     milestone.workOrderMilestoneId.toString();
                 panelBlockElement.innerHTML =
-                    '<div class="columns">' +
+                    '<div class="columns is-mobile">' +
                         ('<div class="column is-narrow">' +
                             (milestone.workOrderMilestoneCompletionDate
                                 ? '<span class="button is-static" data-tooltip="Completed ' +

public-typescript/workOrderEdit.ts

@@ -1231,7 +1231,7 @@ declare const bulmaJS: BulmaJS;
                     milestone.workOrderMilestoneId.toString();
 
                 panelBlockElement.innerHTML =
-                    '<div class="columns">' +
+                    '<div class="columns is-mobile">' +
                     ('<div class="column is-narrow">' +
                         (milestone.workOrderMilestoneCompletionDate
                             ? '<span class="button is-static" data-tooltip="Completed ' +

public-typescript/workOrderSearch.js

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
     const urlPrefix = document.querySelector("main").dataset.urlPrefix;
     const searchFilterFormElement = document.querySelector("#form--searchFilters");
     const searchResultsContainerElement = document.querySelector("#container--searchResults");
-    const limit = Number.parseInt(document.querySelector("#searchFilter--limit")
+    const limit = Number.parseInt(document.querySelector("#searchFilter--limit").value, 10);
-        .value, 10);
     const offsetElement = document.querySelector("#searchFilter--offset");
     const getWorkOrders = () => {
         const offset = Number.parseInt(offsetElement.value, 10);
@@ -36,17 +35,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         "</td>") +
                     ("<td>" +
                         cityssm.escapeHTML(workOrder.workOrderType) +
+                        "<br />" +
+                        '<span class="is-size-7">' +
+                        cityssm.escapeHTML(workOrder.workOrderDescription) +
+                        "</span>" +
                         "</td>") +
-                    "<td>" +
+                    ('<td class="is-nowrap">' +
-                    cityssm.escapeHTML(workOrder.workOrderDescription) +
+                        ('<span data-tooltip="Open Date">' +
-                    "</td>" +
+                            '<i class="fas fa-fw fa-play" aria-label="Open Date"></i> ' +
-                    ("<td>" +
+                            workOrder.workOrderOpenDateString +
-                        workOrder.workOrderOpenDateString +
+                            "</span><br />") +
-                        "</td>") +
+                        ('<span data-tooltip="Close Date">' +
-                    ("<td>" +
+                            '<i class="fas fa-fw fa-stop" aria-label="Close Date"></i> ' +
-                        (workOrder.workOrderCloseDate
+                            (workOrder.workOrderCloseDate
-                            ? workOrder.workOrderCloseDateString
+                                ? workOrder.workOrderCloseDateString
-                            : '<span class="has-text-grey">(No Close Date)</span>') +
+                                : '<span class="has-text-grey">(No Close Date)</span>') +
+                            "</span>") +
                         "</td>") +
                     ("<td>" +
                         (workOrder.workOrderMilestoneCount === 0
@@ -61,10 +65,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 '<table class="table is-fullwidth is-striped is-hoverable">' +
                     "<thead><tr>" +
                     "<th>Work Order Number</th>" +
-                    "<th>Work Order Type</th>" +
                     "<th>Work Order Description</th>" +
-                    "<th>Open Date</th>" +
+                    "<th>Date</th>" +
-                    "<th>Close Date</th>" +
                     "<th>Progress</th>" +
                     "</tr></thead>" +
                     "<table>" +
@@ -97,9 +99,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                             : "") +
                         "</div>") +
                     "</div>";
-            searchResultsContainerElement
+            searchResultsContainerElement.querySelector("table").append(resultsTbodyElement);
-                .querySelector("table")
-                .append(resultsTbodyElement);
             if (offset > 0) {
                 searchResultsContainerElement
                     .querySelector("button[data-page='previous']")

public-typescript/workOrderSearch.ts

@@ -17,13 +17,10 @@ declare const cityssm: cityssmGlobal;
     ) as HTMLElement;
 
     const limit = Number.parseInt(
-        (document.querySelector("#searchFilter--limit") as HTMLInputElement)
+        (document.querySelector("#searchFilter--limit") as HTMLInputElement).value,
-            .value,
         10
     );
-    const offsetElement = document.querySelector(
+    const offsetElement = document.querySelector("#searchFilter--offset") as HTMLInputElement;
-        "#searchFilter--offset"
-    ) as HTMLInputElement;
 
     const getWorkOrders = () => {
         const offset = Number.parseInt(offsetElement.value, 10);
@@ -37,10 +34,7 @@ declare const cityssm: cityssmGlobal;
         cityssm.postJSON(
             urlPrefix + "/workOrders/doSearchWorkOrders",
             searchFilterFormElement,
-            (responseJSON: {
+            (responseJSON: { count: number; workOrders: recordTypes.WorkOrder[] }) => {
-                count: number;
-                workOrders: recordTypes.WorkOrder[];
-            }) => {
                 if (responseJSON.workOrders.length === 0) {
                     searchResultsContainerElement.innerHTML =
                         '<div class="message is-info">' +
@@ -67,17 +61,22 @@ declare const cityssm: cityssmGlobal;
                                 "</td>") +
                             ("<td>" +
                                 cityssm.escapeHTML(workOrder.workOrderType) +
+                                "<br />" +
+                                '<span class="is-size-7">' +
+                                cityssm.escapeHTML(workOrder.workOrderDescription) +
+                                "</span>" +
                                 "</td>") +
-                            "<td>" +
+                            ('<td class="is-nowrap">' +
-                            cityssm.escapeHTML(workOrder.workOrderDescription) +
+                                ('<span data-tooltip="Open Date">' +
-                            "</td>" +
+                                    '<i class="fas fa-fw fa-play" aria-label="Open Date"></i> ' +
-                            ("<td>" +
+                                    workOrder.workOrderOpenDateString +
-                                workOrder.workOrderOpenDateString +
+                                    "</span><br />") +
-                                "</td>") +
+                                ('<span data-tooltip="Close Date">' +
-                            ("<td>" +
+                                    '<i class="fas fa-fw fa-stop" aria-label="Close Date"></i> ' +
-                                (workOrder.workOrderCloseDate
+                                    (workOrder.workOrderCloseDate
-                                    ? workOrder.workOrderCloseDateString
+                                        ? workOrder.workOrderCloseDateString
-                                    : '<span class="has-text-grey">(No Close Date)</span>') +
+                                        : '<span class="has-text-grey">(No Close Date)</span>') +
+                                    "</span>") +
                                 "</td>") +
                             ("<td>" +
                                 (workOrder.workOrderMilestoneCount === 0
@@ -94,10 +93,8 @@ declare const cityssm: cityssmGlobal;
                     '<table class="table is-fullwidth is-striped is-hoverable">' +
                     "<thead><tr>" +
                     "<th>Work Order Number</th>" +
-                    "<th>Work Order Type</th>" +
                     "<th>Work Order Description</th>" +
-                    "<th>Open Date</th>" +
+                    "<th>Date</th>" +
-                    "<th>Close Date</th>" +
                     "<th>Progress</th>" +
                     "</tr></thead>" +
                     "<table>" +
@@ -131,9 +128,7 @@ declare const cityssm: cityssmGlobal;
                         "</div>") +
                     "</div>";
 
-                searchResultsContainerElement
+                searchResultsContainerElement.querySelector("table").append(resultsTbodyElement);
-                    .querySelector("table")
-                    .append(resultsTbodyElement);
 
                 if (offset > 0) {
                     searchResultsContainerElement
@@ -164,15 +159,13 @@ declare const cityssm: cityssmGlobal;
     };
 
     const nextAndGetWorkOrders = () => {
-        offsetElement.value = (
+        offsetElement.value = (Number.parseInt(offsetElement.value, 10) + limit).toString();
-            Number.parseInt(offsetElement.value, 10) + limit
-        ).toString();
         getWorkOrders();
     };
 
-    const filterElements = searchFilterFormElement.querySelectorAll(
+    const filterElements = searchFilterFormElement.querySelectorAll("input, select") as NodeListOf<
-        "input, select"
+        HTMLInputElement | HTMLSelectElement
-    ) as NodeListOf<HTMLInputElement | HTMLSelectElement>;
+    >;
 
     for (const filterElement of filterElements) {
         filterElement.addEventListener("change", resetOffsetAndGetWorkOrders);

public/javascripts/workOrderSearch.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=document.querySelector("main").dataset.urlPrefix,t=document.querySelector("#form--searchFilters"),r=document.querySelector("#container--searchResults"),s=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),a=document.querySelector("#searchFilter--offset"),o=()=>{const o=Number.parseInt(a.value,10);r.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Loading Work Orders...</div>',cityssm.postJSON(e+"/workOrders/doSearchWorkOrders",t,t=>{if(0===t.workOrders.length)return void(r.innerHTML='<div class="message is-info"><p class="message-body">There are no work orders that meet the search criteria.</p></div>');const a=document.createElement("tbody");for(const r of t.workOrders)a.insertAdjacentHTML("beforeend",'<tr><td><a class="has-text-weight-bold" href="'+e+"/workOrders/"+r.workOrderId+'">'+cityssm.escapeHTML(r.workOrderNumber)+"</a></td><td>"+cityssm.escapeHTML(r.workOrderType)+"</td><td>"+cityssm.escapeHTML(r.workOrderDescription)+"</td><td>"+r.workOrderOpenDateString+"</td><td>"+(r.workOrderCloseDate?r.workOrderCloseDateString:'<span class="has-text-grey">(No Close Date)</span>')+"</td><td>"+(0===r.workOrderMilestoneCount?"-":r.workOrderMilestoneCompletionCount+" / "+r.workOrderMilestoneCount)+"</td></tr>");r.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th>Work Order Number</th><th>Work Order Type</th><th>Work Order Description</th><th>Open Date</th><th>Close Date</th><th>Progress</th></tr></thead><table><div class="level"><div class="level-left"><div class="level-item has-text-weight-bold">Displaying '+(o+1).toString()+" to "+Math.min(t.count,s+o)+" of "+t.count+'</div></div><div class="level-right">'+(o>0?'<div class="level-item"><button class="button is-rounded is-link is-outlined" data-page="previous" type="button" title="Previous"><i class="fas fa-arrow-left" aria-hidden="true"></i></button></div>':"")+(s+o<t.count?'<div class="level-item"><button class="button is-rounded is-link" data-page="next" type="button" title="Next"><span>Next</span><span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span></button></div>':"")+"</div></div>",r.querySelector("table").append(a),o>0&&r.querySelector("button[data-page='previous']").addEventListener("click",n),s+o<t.count&&r.querySelector("button[data-page='next']").addEventListener("click",d)})},i=()=>{a.value="0",o()},n=()=>{a.value=Math.max(Number.parseInt(a.value,10)-s,0).toString(),o()},d=()=>{a.value=(Number.parseInt(a.value,10)+s).toString(),o()},l=t.querySelectorAll("input, select");for(const e of l)e.addEventListener("change",i);t.addEventListener("submit",e=>{e.preventDefault(),i()}),o()})();
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=document.querySelector("main").dataset.urlPrefix,t=document.querySelector("#form--searchFilters"),r=document.querySelector("#container--searchResults"),s=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),a=document.querySelector("#searchFilter--offset"),i=()=>{const i=Number.parseInt(a.value,10);r.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Loading Work Orders...</div>',cityssm.postJSON(e+"/workOrders/doSearchWorkOrders",t,t=>{if(0===t.workOrders.length)return void(r.innerHTML='<div class="message is-info"><p class="message-body">There are no work orders that meet the search criteria.</p></div>');const a=document.createElement("tbody");for(const r of t.workOrders)a.insertAdjacentHTML("beforeend",'<tr><td><a class="has-text-weight-bold" href="'+e+"/workOrders/"+r.workOrderId+'">'+cityssm.escapeHTML(r.workOrderNumber)+"</a></td><td>"+cityssm.escapeHTML(r.workOrderType)+'<br /><span class="is-size-7">'+cityssm.escapeHTML(r.workOrderDescription)+'</span></td><td class="is-nowrap"><span data-tooltip="Open Date"><i class="fas fa-fw fa-play" aria-label="Open Date"></i> '+r.workOrderOpenDateString+'</span><br /><span data-tooltip="Close Date"><i class="fas fa-fw fa-stop" aria-label="Close Date"></i> '+(r.workOrderCloseDate?r.workOrderCloseDateString:'<span class="has-text-grey">(No Close Date)</span>')+"</span></td><td>"+(0===r.workOrderMilestoneCount?"-":r.workOrderMilestoneCompletionCount+" / "+r.workOrderMilestoneCount)+"</td></tr>");r.innerHTML='<table class="table is-fullwidth is-striped is-hoverable"><thead><tr><th>Work Order Number</th><th>Work Order Description</th><th>Date</th><th>Progress</th></tr></thead><table><div class="level"><div class="level-left"><div class="level-item has-text-weight-bold">Displaying '+(i+1).toString()+" to "+Math.min(t.count,s+i)+" of "+t.count+'</div></div><div class="level-right">'+(i>0?'<div class="level-item"><button class="button is-rounded is-link is-outlined" data-page="previous" type="button" title="Previous"><i class="fas fa-arrow-left" aria-hidden="true"></i></button></div>':"")+(s+i<t.count?'<div class="level-item"><button class="button is-rounded is-link" data-page="next" type="button" title="Next"><span>Next</span><span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span></button></div>':"")+"</div></div>",r.querySelector("table").append(a),i>0&&r.querySelector("button[data-page='previous']").addEventListener("click",n),s+i<t.count&&r.querySelector("button[data-page='next']").addEventListener("click",l)})},o=()=>{a.value="0",i()},n=()=>{a.value=Math.max(Number.parseInt(a.value,10)-s,0).toString(),i()},l=()=>{a.value=(Number.parseInt(a.value,10)+s).toString(),i()},d=t.querySelectorAll("input, select");for(const e of d)e.addEventListener("change",o);t.addEventListener("submit",e=>{e.preventDefault(),o()}),i()})();

views/lotOccupancy-edit.ejs

@@ -71,7 +71,11 @@
                     <div class="field has-addons">
                         <div class="control is-expanded">
                             <div class="select is-fullwidth">
-                                <select id="lotOccupancy--occupancyTypeId" name="occupancyTypeId" required>
+                                <select
+                                    <% if (!isCreate) { %>
+                                        class="is-readonly" 
+                                    <% } %>
+                                    id="lotOccupancy--occupancyTypeId" name="occupancyTypeId" required>
                                     <% if (isCreate) { %>
                                         <option value="">(No Type)</option>
                                     <% } %>
@@ -109,9 +113,9 @@
                     </label>
                     <div class="field has-addons">
                         <div class="control is-expanded">
-                            <input class="input is-clickable has-text-left" id="lotOccupancy--lotName" type="button" value="<%= lotOccupancy.lotName || "(No " + configFunctions.getProperty("aliases.lot") + ")" %>"
+                            <input class="input is-clickable has-text-left <%= (isCreate ? "" : " is-readonly") %>" id="lotOccupancy--lotName" type="button" value="<%= lotOccupancy.lotName || "(No " + configFunctions.getProperty("aliases.lot") + ")" %>"
                             <%= (configFunctions.getProperty("settings.lotOccupancy.lotIdIsRequired") ? " required" : "") %>
-                            <%= (isCreate ? "" : " disabled") %> />
+                            <%= (isCreate ? "" : " disabled readonly") %> />
                         </div>
                         <div class="control is-hidden-print">
                             <button class="button is-clear-lot-button" data-tooltip="Clear" type="button" aria-label="Clear <%= configFunctions.getProperty("aliases.lot") %></button> Field">

views/workOrder-edit.ejs

@@ -38,7 +38,7 @@
     <% } %>
 </h1>
 
-<div class="columns">
+<div class="columns is-desktop">
     <div class="column">
         <form id="form--workOrderEdit">
             <input id="workOrderEdit--workOrderId" name="workOrderId" type="hidden" value="<%= workOrder.workOrderId %>" />
@@ -49,7 +49,7 @@
                             <label class="label" for="workOrderEdit--workOrderNumber">Work Order Number</label>
                             <div class="field has-addons">
                                 <div class="control is-expanded">
-                                    <input class="input" id="workOrderEdit--workOrderNumber" name="workOrderNumber" type="text" value="<%= workOrder.workOrderNumber %>" maxlength="50" readonly <%= (isCreate ? "" : " required") %> />
+                                    <input class="input <%= (isCreate ? "" : " is-readonly") %>" id="workOrderEdit--workOrderNumber" name="workOrderNumber" type="text" value="<%= workOrder.workOrderNumber %>" maxlength="50" readonly <%= (isCreate ? "" : " required") %> />
                                 </div>
                                 <div class="control">
                                     <button class="button is-unlock-field-button" data-tooltip="Unlock Field" type="button" aria-label="Unlock Field">
@@ -192,10 +192,10 @@
         <% } %>
     </div>
     <% if (!isCreate) { %>
-        <div class="column is-4">
+        <div class="column is-4-desktop">
             <div class="panel" id="panel--milestones">
                 <div class="panel-heading">
-                    <div class="level">
+                    <div class="level is-mobile">
                         <div class="level-left">
                             <div class="level-item">
                                 <h2 class="title has-text-weight-bold is-5">Milestones</h2>

views/workOrder-view.ejs

@@ -30,7 +30,7 @@
     </div>
 <% } %>
 
-<div class="columns">
+<div class="columns is-desktop">
     <div class="column">
         <div class="panel">
             <div class="panel-block is-block">
@@ -212,10 +212,10 @@
         <% } %>
     </div>
     <% if (workOrder.workOrderMilestones.length > 0) { %>
-        <div class="column is-4">
+        <div class="column is-4-desktop">
             <div class="panel">
                 <div class="panel-heading">
-                    <div class="level">
+                    <div class="level is-mobile">
                         <div class="level-left">
                             <div class="level-item">
                                 <h2 class="title is-5 has-text-weight-bold">Milestones</h2>
@@ -244,7 +244,7 @@
                 </div>
                 <% for (const milestone of workOrder.workOrderMilestones) { %>
                     <div class="panel-block is-block">
-                        <div class="columns">
+                        <div class="columns is-mobile">
                             <div class="column is-narrow">
                                 <% if (milestone.workOrderMilestoneCompletionDate) { %>
                                     <span class="icon is-small" data-tooltip="Completed <%= milestone.workOrderMilestoneCompletionDateString %>">