niris-public-community-components 0.0.6 → 0.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "niris-public-community-components",
   "private": false,
-  "version": "0.0.6",
+  "version": "0.0.8",
   "homepage": "https://iris.apsl.net",
   "description": "Web components for the NIRIS project developed with the Lit library",
   "main": "dist/index.js",

package/src/form-niris.ts

@@ -57,8 +57,8 @@ export class FormNiris extends LitElement {
   private _map!: Map;
   private _markerIcon!: Icon;
 
-  @property({type: String}) defaultLat: string = '39.5701058'; // Palma de Mallorca
-  @property({type: String}) defaultLon: string = '2.6487098';
+  @property({type: String}) defaultLat = '39.5701058'; // Palma de Mallorca
+  @property({type: String}) defaultLon = '2.6487098';
 
   @property({type: String}) locale: 'es' | 'en' | 'ca' = 'es';
 
@@ -66,42 +66,42 @@ export class FormNiris extends LitElement {
   private isCitizen: Boolean = true;
 
   @state()
-  private activeMap: boolean = false;
+  private activeMap = false;
 
   @state()
   private ubiDistricts: Object[] = [];
 
   @state()
-  private submited: boolean = false;
+  private submited = false;
 
   @state()
-  private error: boolean = false;
+  private error = false;
 
   @state()
-  private incidenceId: string = '';
+  private incidenceId = '';
 
   @state()
-  private extensionFiles: string = '';
+  private extensionFiles = '';
 
   /* Map */
-  @property({type: String}) domain: string =
+  @property({type: String}) domain =
     'https://iris2-backend-demo-iris-community.labs.apsl.io/services/iris/api-public';
   // TODO property for lat and lon
 
   @state()
-  private street: string = '';
+  private street = '';
 
   @state()
-  private streetNumber: string = '';
+  private streetNumber = '';
 
   @state()
-  private latitude: string = '';
+  private latitude = '';
 
   @state()
-  private longitude: string = '';
+  private longitude = '';
 
   @state()
-  private loading: boolean = false;
+  private loading = false;
 
   constructor() {
     super();
@@ -116,7 +116,7 @@ export class FormNiris extends LitElement {
     this.characteristics = [];
 
     this.locale = this.locale ? this.locale : 'es';
-    setLocale(this.locale);
+    // setLocale(this.locale);
 
     // Map
     L.Icon.Default.imagePath = `https://unpkg.com/leaflet@${L.version}/dist/images/`;
@@ -521,7 +521,7 @@ export class FormNiris extends LitElement {
 
       <div>
         <label for="firstSurname">${msg('Primer apellido')}*:</label>
-        <input id="firstSurname" name="firstSurname" type="text" />
+        <input id="firstSurname" name="firstSurname" type="text" required />
       </div>
 
       <div>
@@ -609,6 +609,15 @@ export class FormNiris extends LitElement {
           placeholder=${msg('Escribe tu teléfono')}
         />
       </div>
+
+      <div>
+        <label for="language">${msg('Idioma de la respuesta')}*:</label>
+        <select id="language" name="language" required>
+          <option value="es" selected>${msg('Español')}</option>
+          <option value="ca">${msg('Catalán')}</option>
+          <option value="en">${msg('Inglés')}</option>
+        </select>
+      </div>
     `;
   }
 
@@ -656,8 +665,8 @@ export class FormNiris extends LitElement {
       </div>
 
       <div>
-        <label for="phone">${msg('Idioma de la respuesta')}*:</label>
-        <select id="phone" name="language" required>
+        <label for="language">${msg('Idioma de la respuesta')}*:</label>
+        <select id="language" name="language" required>
           <option value="es" selected>${msg('Español')}</option>
           <option value="ca">${msg('Catalán')}</option>
           <option value="en">${msg('Inglés')}</option>
@@ -704,7 +713,7 @@ export class FormNiris extends LitElement {
         <div>
           <button
             type="button"
-            .disabled="${!Boolean(this.street.length)}"
+            .disabled="${!this.street.length}"
             @click="${this.searchAddress}"
           >
             ${msg('Buscar')}
@@ -829,19 +838,21 @@ export class FormNiris extends LitElement {
     });
 
     if ('characteristics' in errors) {
-      const characteristics = errors['characteristics'];
-      for (let [key, errors] of characteristics.entries()) {
-        if (Object.keys(errors).length !== 0) {
-          debugger;
+      let characteristics = errors['characteristics'];
+      if (!Array.isArray(characteristics)) {
+        characteristics = Object.entries(characteristics);
+      }
+      characteristics.forEach((characteristic: any) => {
+        Object.entries(characteristic).forEach(([key, value]) => {
           const input = this.shadowRoot?.getElementById(
             `niris-${key}`
           ) as HTMLInputElement;
-          errors.value.forEach((error: string) => {
-            input.setCustomValidity(error);
-            input.reportValidity();
-          });
-        }
-      }
+          input.setCustomValidity(value as string);
+          input.reportValidity();
+
+        });
+      });
+
     }
   }
 

package/src/textarea-to-niris.ts

@@ -23,7 +23,7 @@ export class TextareaToNiris extends LitElement {
     this.formAction = '';
     this.keywords = '';
     this.locale = 'es'
-    // setLocale(this.locale);
+    //setLocale(this.locale);
   }
 
   updateShownValue(event: Event) {