@sumaris-net/ngx-components 1.13.2 → 1.14.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "1.13.2",
+  "version": "1.14.2",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",
@@ -11,6 +11,7 @@
   "dependencies": {
     "cordova-android": "9.1.0",
     "lodash.clonedeep": "^4.5.0",
+    "moment-timezone": "^0.5.34",
     "tslib": "^2.2.0"
   },
   "peerDependencies": {

package/src/app/core/services/config/core.config.d.ts

@@ -24,4 +24,5 @@ export declare const CORE_CONFIG_OPTIONS: Readonly<{
     COLOR_ACCENT: FormFieldDefinition<any>;
     COLOR_DANGER: FormFieldDefinition<any>;
     ANDROID_INSTALL_URL: FormFieldDefinition<any>;
+    DB_TIMEZONE: FormFieldDefinition<any>;
 }>;

package/src/app/core/services/network.service.d.ts

@@ -12,7 +12,7 @@ import { Connection, Network } from '@ionic-native/network/ngx';
 import { CacheService } from 'ionic-cache';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { OverlayEventDetail } from '@ionic/core';
-import { NodeInfo } from './network.utils';
+import { AppManifest, NodeInfo } from './network.utils';
 import { StartableService } from '../../shared/services/startable-service.class';
 export declare type ConnectionType = 'none' | 'wifi' | 'ethernet' | 'cell' | 'unknown';
 export declare type AuthTokenType = 'token' | 'basic' | 'basic-and-token';
@@ -85,6 +85,13 @@ export declare class NetworkService extends StartableService<Peer> {
         showToast?: boolean;
     }): Promise<boolean>;
     getNodeInfo(peer?: string | Peer): Promise<NodeInfo>;
+    getAppManifest(peer?: string | Peer, opts?: {
+        nocache?: boolean;
+    }): Promise<AppManifest | undefined>;
+    getAppVersion(peer?: string | Peer, opts?: {
+        nocache?: boolean;
+    }): Promise<string | undefined>;
+    computePeerPath(peer: string | Peer | undefined, path: string): string | undefined;
     /**
      * Allow to force offline mode
      */
@@ -121,6 +128,8 @@ export declare class NetworkService extends StartableService<Peer> {
         headers?: HttpHeaders | {
             [header: string]: string | string[];
         };
+        responseType?: 'json';
+        nocache?: boolean;
     }): Promise<T>;
     protected onDeviceConnectionChanged(connectionType?: string): void;
     protected resetData(): void;

package/src/app/core/services/network.utils.d.ts

@@ -6,6 +6,21 @@ export interface NodeInfo {
     nodeLabel?: string;
     nodeName?: string;
 }
+export interface AppManifest {
+    manifest_version: number;
+    name: string;
+    version: string;
+    start_url: string;
+    short_name?: string;
+    description?: string;
+    version_name?: string;
+    author?: string;
+    default_locale?: string;
+    icons?: any | any[];
+    background_color?: string;
+    theme_color?: string;
+    display?: string;
+}
 export declare class NetworkUtils {
     static getNodeInfo: typeof getNodeInfo;
 }

package/src/app/core/services/platform.service.d.ts

@@ -45,6 +45,7 @@ export declare class PlatformService extends StartableService {
     private _android;
     private _ios;
     private _downloadingJobs;
+    private checkAppVersionTimer;
     constructor(platform: Platform, cdkPlatform: CdkPlatform, toastController: ToastController, translate: TranslateService, dateAdapter: MomentDateAdapter, entitiesStorage: EntitiesStorage, settings: LocalSettingsService, networkService: NetworkService, accountService: AccountService, configService: ConfigService, cache: CacheService, storage: Storage, audioProvider: AudioProvider, environment: any, statusBar: StatusBar, keyboard: Keyboard, splashScreen: SplashScreen, browser: InAppBrowser, downloader: Downloader);
     is(platformName: Platforms): boolean;
     get mobile(): boolean;
@@ -73,6 +74,10 @@ export declare class PlatformService extends StartableService {
     protected configureCordovaPlugins(): void;
     protected configureTranslate(): void;
     protected configureCache(online?: boolean): void;
+    protected checkAppVersion(opts?: {
+        canReload?: boolean;
+        silent?: boolean;
+    }): Promise<void>;
     protected storageReady(): Promise<LocalForage>;
     protected migrateStorage(storage: LocalForage): Promise<void>;
     protected showToast(opts: ShowToastOptions): Promise<HTMLIonToastElement>;

package/src/app/shared/dates.d.ts

@@ -9,6 +9,13 @@ export declare class DateUtils {
     static max(date1: Moment, date2: Moment): Moment;
     static equals(date1: Moment | string, date2: Moment | string): boolean;
     static isSame(date1: Moment | string, date2: Moment | string, granularity?: unitOfTime.StartOf): boolean;
+    /**
+     * Create a copy of a date, without time fields (always return a new Moment object, or undefined).
+     * Same implementation as the Java class Dates.resetTime() (see any SUMARiS like Pod)
+     * @param value
+     * @param timezone a timezone (see https://momentjs.com/timezone/)
+     */
+    static resetTime(value: Moment | string, timezone?: string): Moment | undefined;
 }
 export declare function toDateISOString(value: any): string | undefined;
 export declare function fromDateISOString(value: any): Moment | undefined;

package/src/app/shared/http/http.utils.d.ts

@@ -1,6 +1,7 @@
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 export declare class HttpUtils {
     static getResource<T>(http: HttpClient, uri: string, opts?: {
+        nocache?: boolean;
         headers?: HttpHeaders | {
             [header: string]: string | string[];
         };

package/src/app/shared/upload-file/upload-file.model.d.ts

@@ -1,15 +1,15 @@
 import { Observable } from 'rxjs';
-import { HttpEventType, HttpProgressEvent, HttpResponse } from '@angular/common/http';
+import { HttpEvent, HttpEventType, HttpProgressEvent, HttpResponse } from '@angular/common/http';
 export declare class UploadFile<T> extends File {
     progress?: number;
     deleting?: boolean;
     error?: string;
     response?: FileResponse<T> | HttpResponse<T>;
 }
-export declare type FileUploadFn<T> = (file: File) => Observable<FileEvent<T>>;
+export declare type FileUploadFn<T> = (file: File) => Observable<FileEvent<T> | HttpEvent<T>>;
 export declare type FileDeleteFn<T> = (file: UploadFile<T>) => Promise<boolean>;
 export interface FileProgressEvent {
-    type: HttpEventType;
+    type: HttpEventType.DownloadProgress | HttpEventType.UploadProgress;
     loaded: number;
     total?: number;
     statusText?: string;
@@ -26,3 +26,5 @@ export declare class FileResponse<T> {
     });
 }
 export declare type FileEvent<T> = HttpProgressEvent | HttpResponse<T> | FileProgressEvent | FileResponse<T>;
+export declare function isProgressEvent(event: HttpEvent<any> | FileEvent<any>): event is HttpProgressEvent | FileProgressEvent;
+export declare function isResponseEvent<T>(event: HttpEvent<T> | FileEvent<T>): event is HttpResponse<T> | FileResponse<T>;

package/src/app/shared/version/versions.d.ts

@@ -1,6 +1,7 @@
 export declare class VersionUtils {
     static compare: typeof compareVersionNumbers;
     static isCompatible: typeof isVersionCompatible;
+    static isSame: typeof isSameVersion;
 }
 /**
  * Compare two software version numbers (e.g. 1.7.1)
@@ -22,3 +23,4 @@ export declare class VersionUtils {
  */
 export declare function compareVersionNumbers(v1: any, v2: any): number;
 export declare function isVersionCompatible(minVersion: any, actualVersion: any): boolean;
+export declare function isSameVersion(v1: any, v2: any): boolean;

package/src/assets/i18n/en-US.json

@@ -48,7 +48,6 @@
     "BTN_SHOW_HELP": "Show help",
     "BTN_HIDE": "Hide",
     "BTN_HIDE_MENU": "Hide menu",
-    "BTN_SORT_BY_DOTS": "Sort by...",
     "BTN_SHOW": "Show",
     "BTN_SHOW_MENU": "Show menu",
     "BTN_SHOW_MORE": "Show more",
@@ -107,7 +106,6 @@
     "RECORDER": "Recorder",
     "RESULT_COUNT": "{{count}} results",
     "NO_RESULT": "No result",
-    "NO_DATA": "No data",
     "LOADING_DOTS": "Loading...",
     "MISSING": "Missing",
 
@@ -136,7 +134,6 @@
       "ENABLE_GRAVATAR": "User > Enable Gravatar ?",
       "DEFAULT_LOCALE": "Default Language",
       "DEFAULT_LATLONG_FORMAT": "Default lat/lon format",
-      "NOT_SELF_DATA_ACCESS_MIN_ROLE": "User profile (min) to access other people data",
       "APP_MIN_VERSION": "App > Minimal compatible version (x.y.z)",
       "HELP_URL": "App > User manual (URL)",
       "FORUM_URL": "App > Forum address (URL)",
@@ -494,7 +491,6 @@
     "LOAD_ERROR": "Error while loading",
     "SAVE_ERROR": "Error while saving",
     "SUBSCRIBE_ERROR": "Error while subscribe to changes",
-    "FIELD_NOT_EXISTS": "Value doesn't exist",
     "FIREFOX_NO_STORAGE": "The application cannot run with Firefox in 'private' mode or without keeping navigation history"
   },
   "CONFIRM": {
@@ -510,7 +506,8 @@
     "DELETE_ROWS": "<b>Are you sure</b> you want to delete this rows?",
     "CANCEL_ROW": "<b>Are you sure</b> you want to cancel changes on this row ?",
     "CANCEL_ROWS": "<b>Are you sure</b> you want to cancel changes on these rows ?",
-    "SEND_DEBUG_DATA": "Do you want to send this data to the administrator for help?"
+    "SEND_DEBUG_DATA": "Do you want to send this data to the administrator for help?",
+    "RELOAD_APP": "A new <b>version {{version}}</b> is available for {{name}}:<ul><li><b>Save</b> any current changes<li>Click on the <b>Update</b> button, or refresh the browser tab.</ul>"
   },
   "INFO": {
     "ALERT_HEADER": "Information",

package/src/assets/i18n/en.json

@@ -48,7 +48,6 @@
     "BTN_SHOW_HELP": "Show help",
     "BTN_HIDE": "Hide",
     "BTN_HIDE_MENU": "Hide menu",
-    "BTN_SORT_BY_DOTS": "Sort by...",
     "BTN_SHOW": "Show",
     "BTN_SHOW_MENU": "Show menu",
     "BTN_SHOW_MORE": "Show more",
@@ -107,7 +106,6 @@
     "RECORDER": "Recorder",
     "RESULT_COUNT": "{{count}} results",
     "NO_RESULT": "No result",
-    "NO_DATA": "No data",
     "LOADING_DOTS": "Loading...",
     "MISSING": "Missing",
 
@@ -136,7 +134,6 @@
       "ENABLE_GRAVATAR": "User > Enable Gravatar ?",
       "DEFAULT_LOCALE": "Default Language",
       "DEFAULT_LATLONG_FORMAT": "Default lat/lon format",
-      "NOT_SELF_DATA_ACCESS_MIN_ROLE": "User profile (min) to access other people data",
       "APP_MIN_VERSION": "App > Minimal compatible version (x.y.z)",
       "HELP_URL": "App > User manual (URL)",
       "FORUM_URL": "App > Forum address (URL)",
@@ -494,7 +491,6 @@
     "LOAD_ERROR": "Error while loading",
     "SAVE_ERROR": "Error while saving",
     "SUBSCRIBE_ERROR": "Error while subscribe to changes",
-    "FIELD_NOT_EXISTS": "Value doesn't exist",
     "FIREFOX_NO_STORAGE": "The application cannot run with Firefox in 'private' mode or without keeping navigation history"
   },
   "CONFIRM": {
@@ -510,7 +506,8 @@
     "DELETE_ROWS": "<b>Are you sure</b> you want to delete this rows?",
     "CANCEL_ROW": "<b>Are you sure</b> you want to cancel changes on this row ?",
     "CANCEL_ROWS": "<b>Are you sure</b> you want to cancel changes on these rows ?",
-    "SEND_DEBUG_DATA": "Do you want to send this data to the administrator for help?"
+    "SEND_DEBUG_DATA": "Do you want to send this data to the administrator for help?",
+    "RELOAD_APP": "A new <b>version {{version}}</b> is available for {{name}}:<ul><li><b>Save</b> any current changes<li>Click on the <b>Update</b> button, or refresh the browser tab.</ul>"
   },
   "INFO": {
     "ALERT_HEADER": "Information",

package/src/assets/i18n/fr.json

@@ -69,7 +69,7 @@
     "DATE_SHORT_PATTERN": "DD/MM/YY",
     "DATE_MONTH_YEAR_PATTERN": "MM/YYYY",
     "DATE_YEAR_PATTERN": "YYYY",
-    "DATE_YEAR_PLACEHOLDER": "yyyy",
+    "DATE_YEAR_PLACEHOLDER": "aaaa",
     "DATE_PLACEHOLDER": "jj/mm/aaaa",
     "DATE_TIME_PLACEHOLDER": "jj/mm/aaaa hh:mm",
 
@@ -281,7 +281,7 @@
       "LAT_LONG_FORMAT": "Format latitude/longitude"
     },
     "INFO": {
-      "RELOADED": "Votre compte utilisateur a été actualisé !"
+      "RELOADED": "Votre compte utilisateur a été <b>actualisé</b> !"
     },
     "ERROR": {
       "SUBSCRIBE_ERROR": "Échec de l'abonnement distant au compte utilisateur."
@@ -507,7 +507,8 @@
     "DELETE_ROWS": "<b>Êtes-vous sûr</b> de vouloir supprimer ces lignes ?",
     "CANCEL_ROW": "<b>Êtes-vous sûr</b> de vouloir annuler les modifications sur cette ligne ?",
     "CANCEL_ROWS": "<b>Êtes-vous sûr</b> de vouloir annuler les modifications sur ces lignes ?",
-    "SEND_DEBUG_DATA": "Voulez-vous envoyer ces données à l'administrateur, afin qu'il vous aide ?"
+    "SEND_DEBUG_DATA": "Voulez-vous envoyer ces données à l'administrateur, afin qu'il vous aide ?",
+    "RELOAD_APP": "Une nouvelle <b>version {{version}}</b> est disponible pour {{name}}:<ul><li><b>Enregistrer</b> vos éventuelles modifications en cours<li>Cliquez sur le bouton <b>Mettre à jour</b>, ou rafraichissez l'onglet du navigateur.</ul>"
   },
   "INFO": {
     "ALERT_HEADER": "Information",

package/src/assets/manifest.json

@@ -1,12 +1,12 @@
 {
-  "name": "ADAP",
-  "short_name": "ADAP",
+  "name": "ngx-sumaris-components",
+  "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "1.8.5",
+  "version": "1.13.2",
   "default_locale": "fr",
-  "description": "ADAP App.",
+  "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{
-    "src": "assets/img/logo-adap-small.png",
+    "src": "assets/img/logo/logo-sumaris.png",
     "sizes": "183x120",
     "type": "image/png"
   }],

package/src/environments/environment.class.d.ts

@@ -20,6 +20,7 @@ export declare class Environment {
         path?: string;
     }[];
     peerMinVersion?: string;
+    checkAppVersionIntervalInSeconds?: number;
     persistCache?: boolean;
     offline?: boolean;
     apolloFetchPolicy?: FetchPolicy;

package/src/theme/_responsive.scss

@@ -12,7 +12,6 @@ html.plt-mobile {
     display: inherit !important;
     visibility: visible !important;
   }
-
 }
 html:not(.plt-mobile) {
   [visible-mobile],
@@ -46,6 +45,11 @@ html:not(.plt-mobile) {
   .padding-top-xs {
     padding-top: 10px;
   }
+
+  ion-toolbar ion-title {
+    font-size: 18px;
+    padding-inline: 8px;
+  }
 }
 
 @media screen and (min-width: $screen-sm) {
@@ -329,8 +333,8 @@ html:not(.plt-mobile) {
     text-align: start !important;
     line-height: 37px;
     margin-top: 0;
-    margin-bottom: 0px;
-    margin-right: 0px;
+    margin-bottom: 0;
+    margin-right: 0;
     //padding-left: var(--ion-label-padding, 11px);
     //background-color: var(--ion-color-light);
   }