last location inputs, price as integer

Pages/Fundvelo/CaritasServiceFundVeloMissingKeyDataPage.razor

@@ -70,7 +70,7 @@
                 </div>
                 <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-4-tablet mat-layout-grid-cell-span-8-desktop">
                     <div class="mat-layout-grid-inner">
-                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-4-tablet mat-layout-grid-cell-span-12-desktop">
+                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
                             <div class="mat-layout-grid-inner">
                                 <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-6-desktop">
                                     <div class="mat-layout-grid-inner">
@@ -111,7 +111,7 @@
                                             </MatSelectValue>
                                         </div>
                                         <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
-                                            <MatStringField Class="w-100 form-check-label" Label="@I18n["FrameNumber"]" Outlined="true" type="text" @bind-Value="frameNumber"
+                                            <MatStringField Class="w-100" Label="@I18n["FrameNumber"]" Outlined="true" type="text" @bind-Value="frameNumber"
                                                             OnKeyDown="@InputCursorHandler.OnKeyDownHandlerAsync" maxlength="20"></MatStringField>
                                         </div>
                                     </div>
@@ -123,8 +123,29 @@
                                                                    OnKeyDown="@InputCursorHandler.OnConstrainedFieldKeyDownHandlerAsync" pattern="^([0-9]*)$"></MatNumericUpDownField>
                                         </div>
                                         <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-4-tablet mat-layout-grid-cell-span-12-desktop">
-                                            <MatTextField Class="w-100 form-check-label" Label="@I18n["Price"]" Format="0.00" Outlined="true" @bind-Value="@price"
-                                                          OnKeyDown="@InputCursorHandler.OnConstrainedFieldKeyDownHandlerAsync" pattern="^([0-9]+,?[0-9]*|,[0-9]+)$"></MatTextField>
+                                            <MatNumericUpDownField Class="w-100" Label="@I18n["Price"]" Outlined="true" @bind-Value="@price"
+                                                                   OnKeyDown="@InputCursorHandler.OnConstrainedFieldKeyDownHandlerAsync" pattern="^([0-9]{0,5})$"></MatNumericUpDownField>
+                                        </div>
+                                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
+                                            <MatDatePicker Class="w-100" Label="@I18n["LastLocation.Date"]" Outlined="true" EnableTime="true" Enable24hours="true" EnableWeekNumbers="true" AllowInput="true"
+                                                           Maximum="@DateTime.Now" @bind-Value="lastLocationDateTime" @onkeydown="InputCursorHandler.OnKeyDownHandlerAsync">
+                                            </MatDatePicker>
+                                        </div>
+                                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
+                                            <MatStringField Class="w-100" Label="@I18n["LastLocation.Street"]" Outlined="true" type="text" @bind-Value="lastLocationStreet"
+                                                            OnKeyDown="@InputCursorHandler.OnKeyDownHandlerAsync" maxlength="50"></MatStringField>
+                                        </div>
+                                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
+                                            <div class="outlined">
+                                                <MatAutocompleteList TItem="ZipCity" FullWidth="true" Label="@I18n["LastLocation.ZipCity"]" Items="@ZipCities" OnTextChanged="setZipCityValue" @bind-Value="SelectedZipCity" CustomStringSelector="@(i => i?.Zip_City)"
+                                                                     ShowClearButton="true" NumberOfElementsInPopup="6" @onkeydown="InputCursorHandler.OnKeyDownHandlerAsync">
+                                                    <ItemTemplate>
+                                                        <div>
+                                                            <span>@context?.Zip_City</span>
+                                                        </div>
+                                                    </ItemTemplate>
+                                                </MatAutocompleteList>
+                                            </div>
                                         </div>
                                         <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
                                             <MatSelectValue FullWidth="true" Outlined="true" Label="@I18n["SearchService"]" @bind-Value="selectedSearchService" Items="@SearchServices" ValueSelector="@(i=>i)"
@@ -136,20 +157,17 @@
                                                 </ItemTemplate>
                                             </MatSelectValue>
                                         </div>
-                                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-4-tablet mat-layout-grid-cell-span-12-desktop">
-                                            <MatStringField Class="w-100 form-check-label" Label="@I18n["SearchServiceNbr"]" Outlined="true" type="text" @bind-Value="searchServiceNbr"
+
+                                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
+                                            <MatStringField Class="w-100" Label="@I18n["SearchServiceNbr"]" Outlined="true" type="text" @bind-Value="searchServiceNbr"
                                                             OnKeyDown="@InputCursorHandler.OnKeyDownHandlerAsync" maxlength="20"></MatStringField>
                                         </div>
-                                        @*<div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-4-tablet mat-layout-grid-cell-span-12-desktop">
-                            <MatStringField Class="w-100 form-check-label" Label="@I18n["Remark"]" Outlined="true" type="text" @bind-Value="remark"
-                            OnKeyDown="@InputCursorHandler.OnKeyDownHandlerAsync" maxlength="1000" rows="2" TextArea="true"></MatStringField>
-                        </div>*@
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-4-tablet mat-layout-grid-cell-span-12-desktop">
-                            <MatStringField Class="w-100 form-check-label" Label="@I18n["Remark"]" Outlined="true" type="text" @bind-Value="remark"
+                        <div class="mat-layout-grid-cell mat-layout-grid-cell-span-4-phone mat-layout-grid-cell-span-8-tablet mat-layout-grid-cell-span-12-desktop">
+                            <MatStringField Class="w-100" Label="@I18n["Remark"]" Outlined="true" type="text" @bind-Value="remark"
                                             OnKeyDown="@InputCursorHandler.OnKeyDownHandlerAsync" maxlength="1000" rows="2" TextArea="true"></MatStringField>
                         </div>
                     </div>
@@ -190,8 +208,21 @@
     private string remark;
     private string searchServiceNbr;
     private uint age;
-    private float price;
+    private uint price;
+    private DateTime? lastLocationDateTime;
+    private string lastLocationStreet;
+    private string lastLocationZipCity;
+    private ZipCity selectedZipCity;
 
+    private ZipCity SelectedZipCity {
+        get { return selectedZipCity; }
+        set { selectedZipCity = (value != null) ? value : new ZipCity(lastLocationZipCity); }
+    }
+
+    private void setZipCityValue(string value) {
+        lastLocationZipCity = value;
+        selectedZipCity = null;
+    }
 
     private void setBrandValue(string value) {
         brandStringValue = value;
@@ -244,6 +275,10 @@
         get => MasterDataService.SearchServices;
     }
 
+    private ZipCity[] ZipCities {
+        get => MasterDataService.ZipCities;
+    }
+
     private void Next() {
         updateDtoFromGUI();
         PageHistoryManager.AddPageToHistory(NavigationManager.Uri);
@@ -297,6 +332,9 @@
         frameNumber = report.RahmenNummer;
         age = report.Alter;
         price = report.Preis;
+        lastLocationDateTime = report.StandortDatum;
+        lastLocationStreet = report.StandortStrasse;
+        SelectedZipCity = new ZipCity(report.StandortPlz, report.StandortOrt);
         selectedSearchService = Array.Find(SearchServices, searchService => searchService.Id == report.SuchDienstId);
         searchServiceNbr = report.SuchDienstNr;
         remark = report.Bemerkung;
@@ -320,6 +358,10 @@
         report.Preis = price;
         report.SuchDienstId = selectedSearchService != null ? selectedSearchService.Id : null;
         report.SuchDienstNr = searchServiceNbr;
+        report.StandortDatum = lastLocationDateTime;
+        report.StandortStrasse = lastLocationStreet;
+        report.StandortPlz = SelectedZipCity.Zip;
+        report.StandortOrt = SelectedZipCity.City;
     }
 
 }

Properties/launchSettings.json

@@ -24,9 +24,9 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "nativeDebugging": true,
+      "nativeDebugging": false,
       "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "jsWebView2Debugging": false,
+      "jsWebView2Debugging": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
     }
   }

Shared/Models/Fundvelo/MissingReport.cs

@@ -1,16 +1,21 @@
-namespace cwebplusApp.Shared.Models {
+using System;
+
+namespace cwebplusApp.Shared.Models {
     public class MissingReport : Report {
-        public string Mail { get; set; }        // required
         public string PersonPLZ { get; set; }   // required
         public string PersonOrt { get; set; }   // required
         public string PersonStrasse { get; set; } // required
         public uint Alter { get; set; }
-        public float Preis { get; set; }
+        public uint Preis { get; set; }
         public string NeueMarke { get; set; }
         public string Zusatz { get; set; }
         public string Postfach { get; set; }
         public int? SuchDienstId { get; set; }
         public string SuchDienstNr { get; set; }
+        public string StandortStrasse { get; set; }
+        public string StandortPlz { get; set; }
+        public string StandortOrt { get; set; }
+        public DateTime? StandortDatum { get; set; }
 
 
         public MissingReport() : this("", "", "", "", "", "", "", null, null, null) {

Shared/Models/Fundvelo/Report.cs

@@ -6,7 +6,7 @@
         public string Nachname { get; set; }                // required
         public string Mobil { get; set; }
         public string Telefon { get; set; }
-        public string Mail { get; set; }
+        public string Mail { get; set; }                     // required
         public int? TypId { get; set; }                      // required
         public int? MarkeId { get; set; }                    // required
         public int? FarbeId { get; set; }                    // required

Shared/Models/Fundvelo/ZipCity.cs

@@ -19,7 +19,7 @@
         public ZipCity(string _zip, string _city) {
             Zip = _zip;
             City = _city;
-            Zip_City = _zip + " " + _city;
+            Zip_City = (_zip + " " + _city).Trim();
         }
 
     }

Shared/ResourceFiles/Resources.de.resx

@@ -399,6 +399,15 @@ Die KulturLegi wirkt dem entgegen indem sie Kultur-, Bildungs- und Sportangebote
   <data name="Info.SendPendigs.Title" xml:space="preserve">
     <value>Ausstehende Berichte erfolgreich gesendet!</value>
   </data>
+  <data name="LastLocation.Date" xml:space="preserve">
+    <value>Zuletzt gesehen am</value>
+  </data>
+  <data name="LastLocation.Street" xml:space="preserve">
+    <value>Letzter Standort (Strasse/Nr.)</value>
+  </data>
+  <data name="LastLocation.ZipCity" xml:space="preserve">
+    <value>Letzter Standort (PLZ/Ort)</value>
+  </data>
   <data name="Lastname" xml:space="preserve">
     <value>Nachname</value>
   </data>

Shared/ResourceFiles/Resources.fr.resx

@@ -399,6 +399,15 @@ La KulturLegi s'attaque à ce problème en rendant les activités culturelles,
   <data name="Info.SendPendigs.Title" xml:space="preserve">
     <value>Rapports en attente envoyés avec succès !</value>
   </data>
+  <data name="LastLocation.Date" xml:space="preserve">
+    <value>Last seen on</value>
+  </data>
+  <data name="LastLocation.Street" xml:space="preserve">
+    <value>Last Location (Street/Nbr)</value>
+  </data>
+  <data name="LastLocation.ZipCity" xml:space="preserve">
+    <value>Last Location (Zip/City)</value>
+  </data>
   <data name="Lastname" xml:space="preserve">
     <value>Nom de famille</value>
   </data>

Shared/ResourceFiles/Resources.it.resx

@@ -399,6 +399,15 @@ La KulturLegi si oppone a questo rendendo le attività culturali, educative e sp
   <data name="Info.SendPendigs.Title" xml:space="preserve">
     <value>Rapporti in sospeso inviati con successo!</value>
   </data>
+  <data name="LastLocation.Date" xml:space="preserve">
+    <value>Ultimo avvistamento il</value>
+  </data>
+  <data name="LastLocation.Street" xml:space="preserve">
+    <value>Ultimo Luogo  (Strada/Numero)</value>
+  </data>
+  <data name="LastLocation.ZipCity" xml:space="preserve">
+    <value>Ultimo Luogo  (CAP/Città)</value>
+  </data>
   <data name="Lastname" xml:space="preserve">
     <value>Cognome</value>
   </data>

Shared/ResourceFiles/Resources.resx

@@ -399,6 +399,15 @@ The KulturLegi counteracts this by making cultural, educational and sporting act
   <data name="Info.SendPendigs.Title" xml:space="preserve">
     <value>Pending reports successfully sent!</value>
   </data>
+  <data name="LastLocation.Date" xml:space="preserve">
+    <value>Dernier vu le</value>
+  </data>
+  <data name="LastLocation.Street" xml:space="preserve">
+    <value>Dernier Lieu (Rue/N°)</value>
+  </data>
+  <data name="LastLocation.ZipCity" xml:space="preserve">
+    <value>Dernier Lieu (Code postal/Ville)</value>
+  </data>
   <data name="Lastname" xml:space="preserve">
     <value>Last name</value>
   </data>

Shared/Services/PermissionsProvider.cs

@@ -1,5 +1,4 @@
 using Microsoft.JSInterop;
-using System;
 using System.Threading.Tasks;
 
 namespace cwebplusApp.Shared.Services {

wwwroot/css/app.css

@@ -169,7 +169,8 @@ div.icon-only.mat-select {
     opacity: 1;
 }
 
-div.mat-autocomplete-list.mat-autocomplete-list-wrapper {
+div.mat-autocomplete-list.mat-autocomplete-list-wrapper,
+div.mdc-select--outlined {
     margin-bottom: 0.5rem;
 }