diff --git a/package.json b/package.json
index e7caaeb9f..4fdba1f35 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
"e2e": "ng e2e",
"test": "jest --detectOpenHandles --runInBand",
"test:prof": "ionic build --prod && npm run test",
- "dev": "lite-server --baseDir=www"
+ "build:serve" : "ionic build --prod && cp -r ./www ./serve",
+ "dev:serve": "lite-server --baseDir=serve"
},
"private": true,
"dependencies": {
diff --git a/readme.md b/readme.md
index e291cf59b..dfd601f08 100644
--- a/readme.md
+++ b/readme.md
@@ -40,6 +40,14 @@ ionic serve build --prod
npm run test
```
+
+## Deploy in local network[.](#run-test)
+
+```bash
+ionic build --prod
+npm run dev:share
+```
+
## Contributing
For major changes, please open an issue first to discuss what you would like to change.
diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts
index d853cb321..ab56668d6 100644
--- a/src/app/models/event.model.ts
+++ b/src/app/models/event.model.ts
@@ -21,7 +21,7 @@ export class Event{
Organizer: string;
Category: string;
HasAttachments: boolean;
- EventRecurrence?: EventRecurrence;
+ EventRecurrence: EventRecurrence;
/* public Event(){
this.EventRecurrence = new EventRecurrence();
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index cc120a3b4..b372d759e 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -74,7 +74,6 @@
-
@@ -97,7 +96,8 @@
-
+
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index ac64cd09f..d0d364566 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -67,6 +67,13 @@
+
+ Lista vazia
+
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index 52cb939c9..70e8d2e1a 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -27,10 +27,10 @@
+
-
+
+ Lista vazia
+
+
@@ -94,4 +101,5 @@
+
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 5a52282c3..61ceef3b1 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -60,6 +60,13 @@
+
+
+ Lista vazia
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index c103a5ff6..c31640ca0 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -114,6 +114,26 @@
+
+
+
+
+
+
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 5fff5e249..279c9770e 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -204,9 +204,9 @@ export class EditEventPage implements OnInit {
Validators.required
]),
participantes: new FormControl(this.taskParticipants, [
- Validators.required
+ // Validators.required
]),
- Date: new FormControl(this.dateControlStart.value.toLocaleString() < this.dateControlEnd.value.toLocaleString()? 'ok': null,[
+ Date: new FormControl( new Date(this.dateControlStart.value).toLocaleString() < new Date(this.dateControlEnd.value).toLocaleString()? 'ok': null,[
Validators.required
]),
@@ -259,6 +259,15 @@ export class EditEventPage implements OnInit {
this.getDatepickerData()
this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
+ if(!this.postEvent.EventRecurrence.hasOwnProperty('Type')) {
+ this.postEvent.EventRecurrence.Type = '-1'
+ }
+
+ //
+ if(this.postEvent.EventRecurrence.Type == undefined) {
+ this.postEvent.EventRecurrence.Type = '-1'
+ }
+
this.showLoader = true;
await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index bce185484..6cb7da1b5 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -249,9 +249,9 @@ export class NewEventPage implements OnInit {
Validators.required
]),
participantes: new FormControl(this.taskParticipants, [
- Validators.required
+ // Validators.required
]),
- Date: new FormControl(this.postEvent.StartDate.getTime() < this.postEvent.EndDate.getTime() ? 'ok': null,[
+ Date: new FormControl( new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime() ? 'ok': null,[
Validators.required
]),
@@ -357,10 +357,16 @@ export class NewEventPage implements OnInit {
if(this.documents.length >= 0) {
this.postEvent.HasAttachments = true;
}
- if(this.selectedRecurringType != '-1'){
+
+ if(this.selectedRecurringType != '-1') {
this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
}
+ //
+ if(this.postEvent.EventRecurrence.Type == undefined) {
+ this.postEvent.EventRecurrence.Type = '-1'
+ }
+
if(this.loggeduser.Profile == 'MDGPR') {
// console.log('MD - Aqui');
// console.log(this.postEvent);
@@ -369,7 +375,6 @@ export class NewEventPage implements OnInit {
console.log(this.postEvent);
-
let loader = this.toastService.loading();
console.log(this.postEvent);
@@ -422,7 +427,7 @@ export class NewEventPage implements OnInit {
this.showLoader = false
this.toastService.badRequest('Evento não criado')
- });
+ });
}
else if(this.loggeduser.Profile == 'PR') {
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 435ceca7c..84a4dea87 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -45,6 +45,14 @@
+
+
+ Lista vazia
+
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index b5cd61ff5..d3512b156 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -55,6 +55,12 @@
+
+ Lista vazia
+
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index b7f6208ec..36bd467ee 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -106,6 +106,24 @@
+
+
+
+