Commit 742282bd by Matteo

Modifica Date + Rimozione <br> da notifiche

parent 7ad8d4f3
......@@ -12,8 +12,8 @@ android {
applicationId "it.aimconsulting.intranet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 13
versionName "0.0.13"
versionCode 16
versionName "0.0.16"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
......
......@@ -64,7 +64,7 @@ export class DocumentiPage implements OnInit {
setDateDa()
{
this.datePicker.show({
date: new Date(),
date: this.date1 != ""?this.date1:new Date(),
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
......@@ -76,7 +76,7 @@ export class DocumentiPage implements OnInit {
setDateA()
{
this.datePicker.show({
date: new Date(),
date: this.date2 != ""?this.date2:new Date(),
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
......
......@@ -315,7 +315,7 @@ export class IntervistePage implements OnInit {
setDateDa()
{
this.datePicker.show({
date: new Date(),
date: this.date1 != ""?this.date1:new Date(),
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
......@@ -327,7 +327,7 @@ export class IntervistePage implements OnInit {
setDateA()
{
this.datePicker.show({
date: new Date(),
date: this.date2 != ""?this.date2:new Date(),
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
......
......@@ -273,7 +273,7 @@ export class SegreteriaPage implements OnInit {
setDateDa()
{
this.datePicker.show({
date: new Date(),
date: this.date1 != ""?this.date1:new Date(),
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
......@@ -285,7 +285,7 @@ export class SegreteriaPage implements OnInit {
setDateA()
{
this.datePicker.show({
date: new Date(),
date: this.date2 != ""?this.date2:new Date(),
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
......
......@@ -115,7 +115,7 @@ export class NotificheService {
if (!res.error) {
let notifiche: Notifica[] = [];
if(!this.platform.is("desktop"))
res.notifiche.forEach(element => element.contenuto = element.contenuto.replace("<br>", "\r\n"));
res.notifiche.forEach(element => element.contenuto = element.contenuto.replace(/<br>/g, "\r\n"));
this.errorRespose.error = false;
return notifiche;
}
......
......@@ -3,10 +3,10 @@
// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false,
//BASE_ADDRESS: 'https://gestionale2.2p2.it/stman',
production: true,
BASE_ADDRESS: 'https://gestionale2.2p2.it/stman',
//BASE_ADDRESS: "http://localhost:8080/stman",
BASE_ADDRESS: "http://192.168.1.126:8080/stman",
//BASE_ADDRESS: "http://192.168.1.127:8080/stman",
//BASE_ADDRESS: "http://192.168.3.101:8080/stman",
eventsTime:3000,
P2PTokenUrl: "https://www.2p2.it/auth-request",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment