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

Fix action

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-09 13:56:17 +01:00
parent 08c5a959d5
commit 8da233c1bc
14 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.xml
-1
View File
@@ -145,7 +145,6 @@
<plugin name="cordova-plugin-statusbar" spec="2.4.2" />
<plugin name="cordova-plugin-device" spec="2.0.2" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
<plugin name="cordova-plugin-ionic-webview" spec="^4.0.0" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
<mfp:android>
<mfp:sdkChecksum>1109370933</mfp:sdkChecksum>
package-lock.json
Generated
+19 -30
View File
@@ -4573,11 +4573,18 @@
}
},
"@ionic-native/ionic-webview": {
"version": "5.31.1",
"resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.31.1.tgz",
"integrity": "sha512-OQjHD4KR12vkvColrGfQEtBjMZiSBp2Zs6VY6XRaJil6IqhM7ypZL8Vnj7rr/rVqDV04GztnUP4/thZEj4crfA==",
"version": "5.35.0",
"resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.35.0.tgz",
"integrity": "sha512-OliPzhM1eAhJW0Q4vzhwb0M98IptN9woXuiaDhRyEBBB3PvukKeGWbVBHdquzVSZYuhz0emrJeDDRhTVQEaJ/Q==",
"requires": {
"@types/cordova": "^0.0.34"
},
"dependencies": {
"@types/cordova": {
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
}
}
},
"@ionic-native/local-notifications": {
@@ -9862,20 +9869,17 @@
}
},
"cordova-android": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.1.0.tgz",
"integrity": "sha512-bzOX9E4eQsOSpa06oZZ7XAGq3DwB73juhhj0oPqHH/khWk0mkCD4aiVYMFoc0fmIaSQvzbY1ww7L6UBW5pyGfg==",
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz",
"integrity": "sha512-2ZEgApK4LPMYW0zh/mLAH3CabzCaKE0yxQTzA2wTf0Eo2HHTJnRtDCf9spGf3nPOkubyXS6+pvzz5QzNHpVTqQ==",
"dev": true,
"requires": {
"android-versions": "^1.5.0",
"cordova-common": "^4.0.1",
"execa": "^4.0.2",
"fast-glob": "^3.2.4",
"fs-extra": "^9.0.1",
"is-path-inside": "^3.0.2",
"nopt": "^4.0.3",
"properties-parser": "^0.3.1",
"semver": "^7.3.4",
"which": "^2.0.2"
},
"dependencies": {
@@ -9917,16 +9921,10 @@
"pump": "^3.0.0"
}
},
"is-path-inside": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
"dev": true
},
"is-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
"dev": true
},
"jsonfile": {
@@ -9948,15 +9946,6 @@
"path-key": "^3.0.0"
}
},
"semver": {
"version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
}
},
"universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -10576,9 +10565,9 @@
"dev": true
},
"cordova-plugin-ionic-webview": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.2.1.tgz",
"integrity": "sha512-7KrmqLaOGq1RP8N2z1ezN1kqkWFzTwwMvQ3/qAkd+exxFZuOe3DIN4eaU1gdNphsxdirI8Ajnr9q4So5vQbWqw==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
"integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg==",
"dev": true
},
"cordova-plugin-mfp": {
package.json
+7 -10
View File
@@ -47,7 +47,7 @@
"@ionic-native/fingerprint-aio": "^4.20.0",
"@ionic-native/http": "^5.31.1",
"@ionic-native/in-app-browser": "^5.28.0",
"@ionic-native/ionic-webview": "^5.30.0",
"@ionic-native/ionic-webview": "^5.35.0",
"@ionic-native/local-notifications": "^4.20.0",
"@ionic-native/splash-screen": "^5.31.1",
"@ionic-native/sqlite": "^5.31.1",
@@ -116,7 +116,7 @@
"@types/jest": "^26.0.24",
"@types/node": "^12.11.1",
"codelyzer": "^6.0.0",
"cordova-android": "^9.1.0",
"cordova-android": "^9.0.0",
"cordova-browser": "^6.0.0",
"cordova-ios": "^6.2.0",
"cordova-plugin-androidx": "^3.0.0",
@@ -129,7 +129,7 @@
"cordova-plugin-globalization": "^1.11.0",
"cordova-plugin-inappbrowser": "^4.0.0",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^4.2.1",
"cordova-plugin-ionic-webview": "^5.0.0",
"cordova-plugin-mfp": "^8.0.2021031007",
"cordova-plugin-mfp-jsonstore": "^8.0.2021062408",
"cordova-plugin-mfp-push": "^8.0.2021062405",
@@ -157,9 +157,6 @@
"cordova-plugin-statusbar": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-inappbrowser": {},
"cordova-plugin-camera": {
@@ -172,12 +169,12 @@
"cordova-plugin-androidx-adapter": {},
"cordova-plugin-fingerprint-aio": {},
"cordova-plugin-mfp-push": {},
"cordova-plugin-mfp-jsonstore": {}
"cordova-plugin-mfp-jsonstore": {},
"cordova-plugin-ionic-webview": {}
},
"platforms": [
"browser",
"ios",
"android"
"ios"
]
},
"main": "karma.conf.js",
@@ -186,4 +183,4 @@
"url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
},
"license": "ISC"
}
}
readme.md
+2
View File
@@ -14,6 +14,8 @@ npm install
npm install -g @ionic/cli
npm install -g lite-server
npm install -g @angular/cli
npm install -g cordova
npm install -g cordova-res
## Mobile first dependencies
cordova plugin add cordova-plugin-mfp-jsonstore
src/_redirects
+1
View File
@@ -0,0 +1 @@
/* /index.html 200
src/app/modals/document-detail/document-detail.page.html
+5 -4
View File
@@ -24,16 +24,17 @@
</div>
<div class="line"></div>
<div class="middle-content">
<h5>Intervenientes</h5>
<h5 >Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div>
<p>{{LoadedDocument.Interveners}}</p>
<p>{{LoadedDocument.Interveners || LoadedDocument.Sender}}</p>
</div>
</ion-label>
</ion-item>
<h5>Status</h5>
<ion-item class="ion-no-margin ion-no-padding">
<h5 *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361">Status</h5>
<ion-item *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361" class="ion-no-margin ion-no-padding">
<p >{{LoadedDocument.Status}}</p>
</ion-item>
</div>
src/app/modals/document-detail/document-detail.page.ts
+3 -1
View File
@@ -52,7 +52,9 @@ export class DocumentDetailPage implements OnInit {
this.LoadedDocument.Subject = this.LoadedDocument.Assunto
let thedate = new Date(this.LoadedDocument.DateDispatch);
let thedate = new Date(this.LoadedDocument.DateDispatch || this.LoadedDocument.DocDate);
console.log(res)
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
});
}
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+7 -5
View File
@@ -202,13 +202,14 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('dateOccurrence')?.invalid && validateFrom ">
<!-- (ngModelChange)="onSelectedRecurringChanged($event)" -->
<mat-form-field appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*"
[(ngModel)]="EventRecurrenceType"
(ngModelChange)="onSelectedRecurringChanged($event)">
[(ngModel)]="EventRecurrenceType"
>
<mat-option
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
>
{{recurring.Description}}
</mat-option>
@@ -224,7 +225,8 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
<!-- (click)="openLastOccurrence()" -->
<div class="ion-input-class flex-grow-1">
<!-- <ion-datetime
placeholder="Última ocorrência"
[(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
src/app/pages/events/events.page.html
+6 -2
View File
@@ -53,8 +53,12 @@
<div class="d-flex content-{{loggeduser.Profile}}-{{event.CalendarName}}">
<div class="schedule-time">
<div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
<div class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.IsAllDayEvent" class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="event.IsAllDayEvent" class="time-start"> Todo </div>
<div *ngIf="event.IsAllDayEvent" class="time-end text-center"> o dia </div>
<div></div>
</div>
<div class="schedule-details">
<div class="location">{{event.Location}}</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -102,7 +102,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
<button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+2
View File
@@ -17,6 +17,7 @@ import { Location } from '@angular/common';
import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchDocument } from 'src/app/models/search-document';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { PermissionService } from 'src/app/OtherService/permission.service';
@Component({
selector: 'app-expediente-detail',
@@ -56,6 +57,7 @@ export class ExpedienteDetailPage implements OnInit {
private toastService: ToastService,
private location: Location,
private attachmentsService: AttachmentsService,
public p: PermissionService
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
-1
View File
@@ -136,7 +136,6 @@ export class OptsExpedientePage implements OnInit {
async openExpedientActionsModal(taskAction: any, task: any) {
alert('save')
console.log(taskAction, task)
this.close();
src/app/shared/publication/view-publications/view-publications.page.ts
+1 -1
View File
@@ -59,6 +59,7 @@ export class ViewPublicationsPage implements OnInit {
if(typeof(this.folderId) == 'object') {
this.folderId = this.folderId['ProcessId']
}
console.log('change view to ',this.folderId)
setTimeout(()=>{
this.getPublications();
@@ -73,7 +74,6 @@ export class ViewPublicationsPage implements OnInit {
setTimeout(() => {
this.getPublicationDetail();
event.target.complete();
}, 3000);
}
src/app/store/publication-list.service.ts
+4 -4
View File
@@ -9,7 +9,7 @@ import { SHA1 } from 'crypto-js'
export class PublicationListService {
// main data
private _document: Publication[] = []
private _document = {}
// local storage keyName
private keyName: string;
@@ -18,8 +18,8 @@ export class PublicationListService {
this.keyName = (SHA1(this.constructor.name+ 'view-publication-list/local')).toString()
setTimeout(()=>{
let restore = localstoreService.get(this.keyName, [])
this._document = restore.document
let restore = localstoreService.get(this.keyName, {})
this._document = restore.document || {}
}, 10)
}
@@ -28,7 +28,7 @@ export class PublicationListService {
return this._document
}
getDocument(folderId: string) {
getDocument(folderId) {
return this._document[folderId]
}