peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-20 12:30:52 +01:00
parent a46474e0aa
commit f73070ff4a
13 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -1
View File
@@ -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": {
readme.md
+8
View File
@@ -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.
src/app/models/event.model.ts
+1 -1
View File
@@ -21,7 +21,7 @@ export class Event{
Organizer: string;
Category: string;
HasAttachments: boolean;
EventRecurrence?: EventRecurrence;
EventRecurrence: EventRecurrence;
/* public Event(){
this.EventRecurrence = new EventRecurrence();
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -2
View File
@@ -74,7 +74,6 @@
</div>
<div *ngIf="skeletonLoader && despachoList.length == 0">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
@@ -97,7 +96,8 @@
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
</div>
</ion-content>
src/app/pages/gabinete-digital/despachos/despachos.page.html
+7
View File
@@ -67,6 +67,13 @@
</div>
</div>
<div
*ngIf="!skeletonLoader && despachoList.length == 0 && despachoList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && despachoList.length == 0">
<ion-list>
src/app/pages/gabinete-digital/expediente/expediente.page.html
+9 -1
View File
@@ -27,10 +27,10 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content d-flex height-100" >
<div class="content d-flex flex-column width-100 overflow-y-auto px-20">
<div class="width-100 flex-grow-1 " *ngIf="taskslist">
<ion-list>
<div
@@ -66,6 +66,13 @@
</ion-list>
</div>
<div
*ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && taskslist.length == 0">
<ion-list>
@@ -94,4 +101,5 @@
</div>
</div>
</div>
</ion-content>
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+7
View File
@@ -60,6 +60,13 @@
</div>
</ion-list>
</div>
<div
*ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<!-- Skeleton loader -->
<div *ngIf="skeletonLoader && taskslist.length == 0">
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+20
View File
@@ -114,6 +114,26 @@
</ion-list>
</div>
</div>
<div *ngSwitchCase="'parecer'" class="d-flex height-100 align-center justify-content-center" >
<div
*ngIf="!skeletonLoader && parecerList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngSwitchCase="'deferimento'" class="d-flex height-100 align-center justify-content-center">
<div
*ngIf="!skeletonLoader && deferimentoList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngIf="skeletonLoader && deferimentoList.length == 0 && skeletonLoader && parecerList.length == 0">
<ion-list>
src/app/shared/agenda/edit-event/edit-event.page.ts
+11 -2
View File
@@ -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 () => {
src/app/shared/agenda/new-event/new-event.page.ts
+10 -5
View File
@@ -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') {
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+8
View File
@@ -45,6 +45,14 @@
</div>
</ion-list>
<div
*ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && taskslist.length == 0">
<ion-list>
src/app/shared/gabinete-digital/expedients/expedients.page.html
+6
View File
@@ -55,6 +55,12 @@
</ion-list>
</div>
<div
*ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
<div *ngIf="skeletonLoader && taskslist.length == 0">
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+18
View File
@@ -106,6 +106,24 @@
</ion-list>
</div>
<div *ngSwitchCase="'parecer'" class="d-flex height-100 align-center justify-content-center" >
<div
*ngIf="!skeletonLoader && parecerList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngSwitchCase="'deferimento'" class="d-flex height-100 align-center justify-content-center">
<div
*ngIf="!skeletonLoader && deferimentoList.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
</div>
</div>
<div *ngIf="skeletonLoader && parecerList.length == 0 && skeletonLoader && deferimentoList.length == 0 ">
<ion-list>