all minor bugs previously discussed are now fixed

kgOrdersClient/View.Orders.dfm

@@ -22,6 +22,18 @@ object FViewOrders: TFViewOrders
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
+  object lblEntries2: TWebLabel
+    Left = 8
+    Top = 358
+    Width = 49
+    Height = 13
+    Caption = 'lblEntries2'
+    ElementID = 'lblentries2'
+    ElementFont = efCSS
+    HeightStyle = ssAuto
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+  end
   object wcbPageSize: TWebComboBox
     Left = -4
     Top = 52
@@ -206,6 +218,12 @@ object FViewOrders: TFViewOrders
     object XDataWebDataSet1colors: TStringField
       FieldName = 'colors'
     end
+    object XDataWebDataSet1plateDue: TStringField
+      FieldName = 'plateDue'
+    end
+    object XDataWebDataSet1plateDone: TStringField
+      FieldName = 'plateDone'
+    end
   end
   object WebDataSource1: TWebDataSource
     DataSet = XDataWebDataSet1

kgOrdersClient/View.Orders.html

@@ -21,10 +21,12 @@
                                 <input class="form-control input-sm" id="dtpenddate" type="date">
                             </div>
                             <div class="col-auto">
-                                <label class="py-2" style="font-weight: 700;">Status Type:</label>
+                                <label style="font-weight: 700;">Status Type:</label>
+                                <div>
                                     <select class="custom-select" id="wcbsortby" style="font-size: 1.00rem;"></select>
                                 </div>
                             </div>
+                        </div>
                         <div class ="row mt-2">
                             <div class="col-auto">
                                 <button class= "mt2-2" id="btnapply"></button>
@@ -48,6 +50,9 @@
                         </div>
                     </form>
                     </div>
+                    <div class="row">
+                        <label id="lblentries"></label>
+                    </div>
                     <table class="table table-responsive table-striped table-bordered" id="tblPhoneGrid">
                         <thead class="thead-dark">
                             <tr>
@@ -59,6 +64,8 @@
                                 <th scope="col">Proof Date</th>
                                 <th scope="col">Art Due</th>
                                 <th scope="col">Art Done</th>
+                                <th scope="col">Plate Due</th>
+                                <th scope="col">Plate Done</th>
                                 <th scope="col">Mount Due</th>
                                 <th scope="col">Mount Done</th>
                                 <th scope="col">Ship Due</th>
@@ -72,7 +79,7 @@
                             <!-- Rows will be added dynamically via Delphi code -->
                         </tbody>
                     </table>
-                    <label id="lblentries"></label>
+                    <label id="lblentries2"></label>
                     <nav aria-label="Page navigation">
                         <ul class="pagination justify-content-center" id="pagination">
                             <!-- Pagination items will be added dynamically via Delphi code -->

kgOrdersClient/View.Orders.pas

@@ -43,6 +43,9 @@ type
     btnFilters: TWebButton;
     dtpStartDate: TWebDateTimePicker;
     dtpEndDate: TWebDateTimePicker;
+    lblEntries2: TWebLabel;
+    XDataWebDataSet1plateDue: TStringField;
+    XDataWebDataSet1plateDone: TStringField;
     procedure WebFormCreate(Sender: TObject);
     procedure btnApplyClick(Sender: TObject);
     procedure btnSearchClick(Sender: TObject);
@@ -187,7 +190,7 @@ begin
   // Art Due Cell
   Cell := TJSHTMLElement(document.createElement('td'));
   Cell.setAttribute('data-label', 'Art Due');
-  if XDataWebDataSet1artDone.Value = '' then
+  if XDataWebDataSet1artDue.Value = '' then
     Cell.innerText := 'None'
   else
     Cell.innerText := XDataWebDataSet1artDue.Value;
@@ -202,6 +205,25 @@ begin
     Cell.innerText := XDataWebDataSet1artDone.Value;
   NewRow.appendChild(Cell);
 
+  // Plate Due Cell
+  Cell := TJSHTMLElement(document.createElement('td'));
+  Cell.setAttribute('data-label', 'Plate Due');
+  if XDataWebDataSet1plateDue.Value = '' then
+    Cell.innerText := 'None'
+  else
+    Cell.innerText := XDataWebDataSet1plateDue.Value;
+  NewRow.appendChild(Cell);
+
+  // Plate Done Cell
+  console.log('plate done');
+  Cell := TJSHTMLElement(document.createElement('td'));
+  Cell.setAttribute('data-label', 'Plate Done');
+  if XDataWebDataSet1plateDone.Value = '' then
+    Cell.innerText := 'None'
+  else
+    Cell.innerText := XDataWebDataSet1plateDone.Value;
+  NewRow.appendChild(Cell);
+
   // Mount Due Cell
   Cell := TJSHTMLElement(document.createElement('td'));
   Cell.setAttribute('data-label', 'Mount Due');
@@ -266,7 +288,6 @@ begin
     colorObject := TJSObject(TJSJSON.parse(XDataWebDataSet1colors.Value));
     colorList := TJSArray(colorObject['items']);
     colors := colorList.flength;
-    console.log(colorList);
     Cell.innerText := IntToStr(colors);
   end;
   NewRow.appendChild(Cell);
@@ -308,6 +329,32 @@ begin
 
   // Page Numbers
 
+  if TotalPages <= 7 then
+  begin
+    for I := 1  to 7 do
+    begin
+      PageItem := TJSHTMLElement(document.createElement('li'));
+      PageItem.className := 'page-item';
+      if I = PageNumber then
+        PageItem.classList.add('selected-number'); // Add the selected-number class
+      PageLink := TJSHTMLElement(document.createElement('a'));
+      PageLink.className := 'page-link';
+      PageLink.innerText := IntToStr(I);
+      PageLink.setAttribute('href', 'javascript:void(0)');
+      PageLink.addEventListener('click', procedure(Event: TJSMouseEvent)
+      var
+        PageNum: Integer;
+      begin
+        PageNum := StrToInt((Event.currentTarget as TJSHTMLElement).innerText);
+        PageNumber := PageNum;
+        GetOrders(GenerateSearchOptions());
+      end);
+      PageItem.appendChild(PageLink);
+      PaginationElement.appendChild(PageItem);
+    end;
+  end
+  else
+  begin
     if PageNumber <= 4 then
     // If page number is low enough no early elipsis needed
     Begin
@@ -421,6 +468,7 @@ begin
     end;
     PageItem.appendChild(PageLink);
     PaginationElement.appendChild(PageItem);
+  end;
 
   // Next Button
   PageItem := TJSHTMLElement(document.createElement('li'));
@@ -464,17 +512,16 @@ begin
     asm
       startSpinner();
     end;
-    console.log(PageNumber);
     xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetOrders',
         [searchOptions]));
     orderList :=  TJSObject(xdcResponse.Result);
     data := TJSArray(orderList['data']);
     callListLength := integer(orderList['count']);
     ClearTable();
+    console.log(orderList['data']);
     XDataWebDataSet1.Close;
     XDataWebDataSet1.SetJsonData(orderList['data']);
     XDataWebDataSet1.Open;
-    console.log(orderList['data']);
     asm
       setTimeout(endSpinner, 2000);
     end;
@@ -485,17 +532,28 @@ begin
       XDataWebDataSet1.Next;
     end;
     TotalPages := (callListLength + PageSize - 1) div PageSize;
-    if (PageNumber * PageSize) < callListLength then
+    if callListLength = 0 then
+    begin
+      lblEntries.Caption := 'No entries found';
+      lblEntries2.Caption := 'No entries found';
+    end
+    else if (PageNumber * PageSize) < callListLength then
     begin
       lblEntries.Caption := 'Showing entries ' + IntToStr((PageNumber - 1) * PageSize + 1) +
                             ' - ' + IntToStr(PageNumber * PageSize) +
                              ' of ' + IntToStr(callListLength);
+      lblEntries2.Caption := 'Showing entries ' + IntToStr((PageNumber - 1) * PageSize + 1) +
+                            ' - ' + IntToStr(PageNumber * PageSize) +
+                             ' of ' + IntToStr(callListLength);
     end
-    else
+    else if (PageNumber * PageSize) >= callListLength then
     begin
        lblEntries.Caption := 'Showing entries ' + IntToStr((PageNumber - 1) * PageSize + 1) +
                             ' - ' + IntToStr(callListLength) +
                              ' of ' + IntToStr(callListLength);
+      lblEntries2.Caption := 'Showing entries ' + IntToStr((PageNumber - 1) * PageSize + 1) +
+                            ' - ' + IntToStr(callListLength) +
+                             ' of ' + IntToStr(callListLength);
     end;
     GeneratePagination(TotalPages);
   end;
@@ -604,6 +662,13 @@ begin
   searchOptions :=  '&pagenumber=' + IntToStr(PageNumber) +
                     '&pagesize=' + IntToStr(PageSize) +
                     '&orderby=' + OrderBy;
+  if btnFilters.Caption = 'Hide Filters' then
+    begin
+      searchOptions := searchOptions +
+                    '&startDate=' + FormatDateTime('yyyy/mm/dd', dtpStartDate.Date) +
+                    '&endDate=' + FormatDateTime('yyyy/mm/dd', dtpEndDate.Date) +
+                    '&filterType=' + wcbSortBy.Text;
+    end;
   Result := searchOptions;
 end;
 

kgOrdersServer/Source/Lookup.Service.pas

@@ -65,6 +65,8 @@ type
      proofDone: string;
      artDue: string;
      artDone: string;
+     plateDue: string;
+     plateDone: string;
      mountDue: string;
      mountDone: string;
      shipDue: string;

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -371,7 +371,7 @@ begin
                       ' AND ' +  quotedStr(startDate) + ' <= oss.STATUS_DATE AND ' +
                                   quotedStr(endDate) + ' >= oss.STATUS_DATE';
 
-    SQL := SQL + 'o.PRICE, qb.QB_REF_NUM ' + whereSQL + ' ORDER BY ' + filterType + '_DUE DESC';
+    SQL := SQL + 'o.PRICE, qb.QB_REF_NUM ' + whereSQL + ' ORDER BY ' + filterType + '_DUE DESC  LIMIT ' + limit + ' OFFSET ' + offset;
   end
   else
   begin
@@ -399,6 +399,8 @@ begin
       order.proofDone := ordersDB.UniQuery1.FieldByName('PROOF_DONE').AsString;
       order.artDue := ordersDB.UniQuery1.FieldByName('ART_DUE').AsString;
       order.artDone := ordersDB.UniQuery1.FieldByName('ART_DONE').AsString;
+      order.plateDue := ordersDB.UniQuery1.FieldByName('PLATE_DUE').AsString;
+      order.plateDone := ordersDB.UniQuery1.FieldByName('PLATE_DONE').AsString;
       order.mountDue := ordersDB.UniQuery1.FieldByName('MOUNT_DUE').AsString;
       order.mountDone := ordersDB.UniQuery1.FieldByName('MOUNT_DONE').AsString;
       order.shipDue := ordersDB.UniQuery1.FieldByName('SHIP_DUE').AsString;

kgOrdersServer/kgOrdersServer.ini

 [Options]
 
-LogFileNum=129
+LogFileNum=134
 
 UpdateTimerLength=0