Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
Intranet
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Matteo
Intranet
Commits
742282bd
Commit
742282bd
authored
Nov 30, 2021
by
Matteo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modifica Date + Rimozione <br> da notifiche
parent
7ad8d4f3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
build.gradle
android/app/build.gradle
+2
-2
documenti.page.ts
src/app/pages/documenti/documenti.page.ts
+2
-2
interviste.page.ts
src/app/pages/interviste/interviste.page.ts
+2
-2
segreteria.page.ts
src/app/pages/segreteria/segreteria.page.ts
+2
-2
notifiche.service.ts
src/app/service/notifiche.service.ts
+1
-1
environment.ts
src/environments/environment.ts
+3
-3
No files found.
android/app/build.gradle
View file @
742282bd
...
...
@@ -12,8 +12,8 @@ android {
applicationId
"it.aimconsulting.intranet"
minSdkVersion
rootProject
.
ext
.
minSdkVersion
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
1
3
versionName
"0.0.1
3
"
versionCode
1
6
versionName
"0.0.1
6
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
aaptOptions
{
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
...
...
src/app/pages/documenti/documenti.page.ts
View file @
742282bd
...
...
@@ -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
(
...
...
src/app/pages/interviste/interviste.page.ts
View file @
742282bd
...
...
@@ -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
(
...
...
src/app/pages/segreteria/segreteria.page.ts
View file @
742282bd
...
...
@@ -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
(
...
...
src/app/service/notifiche.service.ts
View file @
742282bd
...
...
@@ -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
;
}
...
...
src/environments/environment.ts
View file @
742282bd
...
...
@@ -3,10 +3,10 @@
// The list of file replacements can be found in `angular.json`.
export
const
environment
=
{
production
:
fals
e
,
//
BASE_ADDRESS: 'https://gestionale2.2p2.it/stman',
production
:
tru
e
,
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"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment