Display complaint numbers in map popups and keep complaint markers above units,…

Display complaint numbers in map popups and keep complaint markers above units, update assets folder in project

emiMobileServer/Source/Api.Database.dfm

@@ -823,7 +823,6 @@ object ApiDatabaseModule: TApiDatabaseModule
     SpecificOptions.Strings = (
       'PostgreSQL.Schema=lems, avl, entcad')
     Username = 'postgres'
-    Server = '192.168.74.10'
     LoginPrompt = False
     Left = 54
     Top = 38
@@ -834,6 +833,7 @@ object ApiDatabaseModule: TApiDatabaseModule
     SQL.Strings = (
       'SELECT'
       '  ca.COMPLAINTID,'
+      '  ca.COMPLAINT,'
       '  cd.CODE_DESC AS DISPATCHDISTRICT,'
       '  ca.AGENCY AS AGENCY,'
       '  ag.AGENCYNAME AS AGENCY_NAME,'
@@ -953,6 +953,10 @@ object ApiDatabaseModule: TApiDatabaseModule
       Size = 80
       Calculated = True
     end
+    object uqMapComplaintscomplaint: TStringField
+      FieldName = 'complaint'
+      Size = 10
+    end
   end
   object uqBadgeCounts: TUniQuery
     Connection = ucENTCAD

emiMobileServer/Source/Api.Database.pas

@@ -202,6 +202,7 @@ type
     uqMapComplaintspngName: TStringField;
     uqMapUnitsagencytype: TStringField;
     uqUnitListagencytype: TStringField;
+    uqMapComplaintscomplaint: TStringField;
     procedure uqComplaintListCalcFields(DataSet: TDataSet);
     procedure uqMapComplaintsCalcFields(DataSet: TDataSet);
     procedure DataModuleCreate(Sender: TObject);

emiMobileServer/Source/Api.ServiceImpl.pas

@@ -88,6 +88,7 @@ var
   item: TJSONObject;
   UnitsByComplaintMap: TObjectDictionary<string, TJSONArray>;
   complaintId: string;
+  complaintNumber: string;
   unitArray: TJSONArray;
   unitStatus: string;
   latestUpdate: TDateTime;
@@ -171,6 +172,12 @@ begin
           data.AddElement(item);
 
           item.AddPair('ComplaintId', ApiDB.uqMapComplaintsCOMPLAINTID.AsString);
+
+          complaintNumber := Trim(ApiDB.uqMapComplaintsCOMPLAINT.AsString);
+          if Length(complaintNumber) > 2 then
+            complaintNumber := Copy(complaintNumber, 1, 2) + '-' + Copy(complaintNumber, 3, MaxInt);
+
+          item.AddPair('Complaint', complaintNumber);
           item.AddPair('DispatchDistrict', ApiDB.uqMapComplaintsDISPATCHDISTRICT.AsString);
           item.AddPair('Agency', ApiDB.uqMapComplaintsAGENCY.AsString);
           item.AddPair('AgencyName', ApiDB.uqMapComplaintsAGENCY_NAME.AsString);

emiMobileServer/Source/Common.Ini.pas

@@ -94,7 +94,7 @@ begin
     FWebClientVersionFromIni := iniFile.ValueExists('Settings', 'webClientVersion');
 
     // [Database]
-    FDatabaseServer := iniFile.ReadString('Database', 'Server', '192.168.74.10');
+    FDatabaseServer := iniFile.ReadString('Database', 'Server', '');
     FDatabaseServerFromIni := iniFile.ValueExists('Database', 'Server');
 
     FDatabasePort := iniFile.ReadInteger('Database', 'Port', 5433);

emiMobileServer/bin/emiMobileServer.ini

 [Settings]
-LogFileNum=723
-webClientVersion=0.1.0
+LogFileNum=729
+webClientVersion=9.4.0
 
 [Database]
---Server=192.168.102.10
-Server=192.168.74.10
-Port=5433
+Server=192.168.102.10
+--Server=192.168.74.10
+Port=5432
+--Port=5433
 Database=lems_wcso
 Username=postgres
 --Password=postgreSQL

emiMobileServer/emiMobileServer.dproj

@@ -107,8 +107,8 @@
         <DCC_ExeOutput>.\bin</DCC_ExeOutput>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
-        <VerInfo_Release>3</VerInfo_Release>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.2.0;Comments=</VerInfo_Keys>
+        <VerInfo_Release>4</VerInfo_Release>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.4.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.2.0;Comments=</VerInfo_Keys>
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
@@ -185,7 +185,12 @@
                 <Source>
                     <Source Name="MainSource">emiMobileServer.dpr</Source>
                 </Source>
-                <Excluded_Packages/>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k370.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp370.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k370.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp370.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="5">
                 <DeployFile LocalName="emiMobileServer.exe" Configuration="Debug" Class="ProjectOutput">

webEMIMobile/ConnectionModule.pas

@@ -18,7 +18,7 @@ type
   private
     FUnauthorizedAccessProc: TUnauthorizedAccessProc;
   public
-    const clientVersion = '0.1.0';
+    const clientVersion = '9.4.0';
     procedure InitApp(SuccessProc: TSuccessProc;
       UnauthorizedAccessProc: TUnauthorizedAccessProc);
     procedure SetClientConfig(Callback: TVersionCheckCallback);

webEMIMobile/View.Map.pas

@@ -269,7 +269,7 @@ var
   lat, lng: Double;
   uName, unitBadge, agencyType, agencyId, agencyName, agency: string;
   unitId, callType, priorityText, statusText: string;
-  complaintId, codeDesc, priority, priorityBadge, complaintStatusKey, business, address: string;
+  complaintId, complaintNumber, codeDesc, priority, priorityBadge, complaintStatusKey, business, address: string;
   pngName, iconUrl, rowsHtml: string;
   officer1Lname, officer1Fname, officer1Empnum: string;
   officer2Lname, officer2Fname, officer2Empnum: string;
@@ -474,6 +474,10 @@ begin
           item := TJSObject(complaintsData[i]);
 
           complaintId := GetJsonString(item, 'ComplaintId');
+          complaintNumber := GetJsonString(item, 'Complaint');
+
+          if Trim(complaintNumber) = '' then
+            complaintNumber := complaintId;
           codeDesc := GetJsonString(item, 'DispatchCodeDesc');
 
           agencyId := GetJsonString(item, 'Agency');
@@ -540,11 +544,11 @@ begin
             '" data-complaint-status="' +
               HtmlAttrEncode(complaintStatusKey) +
             '" data-picker-label="' +
-              HtmlAttrEncode('Complaint ' + complaintId + IfThen(Trim(codeDesc) <> '', ' - ' + codeDesc, '')) +
+              HtmlAttrEncode('Complaint ' + complaintNumber + IfThen(Trim(codeDesc) <> '', ' - ' + codeDesc, '')) +
             '" style="display:none"></span>' +
             '<div class="d-flex flex-column gap-1 px-1 py-1" style="width:260px;">' +
-                '<div class="fw-semibold small">' +
-                '<span class="fw-bold">Complaint:</span> ' + complaintId +
+              '<div class="fw-semibold small">' +
+                '<span class="fw-bold">Complaint:</span> ' + complaintNumber +
               '</div>' +
               '<div class="small">' +
                 '<span class="fw-bold">Priority:</span> ' + priority +

webEMIMobile/uMapMarkerJs.pas

@@ -396,6 +396,14 @@ begin
       var iconUrl = getMarkerIconUrl(options);
       var meta = readMarkerMeta(popupHtml);
 
+
+      if (meta.markerType === "complaint") {
+        marker.setZIndexOffset(10000);
+      } else if (meta.markerType === "unit") {
+        marker.setZIndexOffset(0);
+      }
+
+
       removeMarkerTitle(marker, options);
       clearDefaultMarkerBindings(marker);
 

webEMIMobile/webEmiMobile.dpr

 program webEmiMobile;
 
+
+
 {$R *.dres}
 
 uses