mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
tiago.kayaya
Generated
+22
-9
@@ -2030,6 +2030,14 @@
|
||||
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
|
||||
"dev": true
|
||||
},
|
||||
"@byteowls/capacitor-filesharer": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@byteowls/capacitor-filesharer/-/capacitor-filesharer-3.0.0.tgz",
|
||||
"integrity": "sha512-7/ZL7eyK/7aZx7A5q2PtKc8s9jWAlHXmPOpINkEeoQ09xZNuKUFR/lxruPDgSJE+4/4wM5M4uxUBYCndmwXOSA==",
|
||||
"requires": {
|
||||
"file-saver": "^2.0.5"
|
||||
}
|
||||
},
|
||||
"@capacitor-community/camera-preview": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor-community/camera-preview/-/camera-preview-1.2.1.tgz",
|
||||
@@ -2069,9 +2077,9 @@
|
||||
"integrity": "sha512-NAIGWnyHBGQ/dgla/D4KDkAeQ2f3fzw+D+DIkGNH3f1ciX4bXC7lNbDVU67SMOuNt+CmcTJF64q3nVXcpv5JvQ=="
|
||||
},
|
||||
"@capacitor/cli": {
|
||||
"version": "3.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-3.3.0.tgz",
|
||||
"integrity": "sha512-BkxagJhHG11+0ivFwUOnAhhdwQ1WXoX0WEzqzzGVL9k63hStuIOvPUusp34+G4EcNU01BAJlBt+dgefSvDhOFw==",
|
||||
"version": "3.3.2",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-3.3.2.tgz",
|
||||
"integrity": "sha512-LmH3DzuwNL3k995CgAs20KXjQhDWrQCQgur3M8nqIKecZk0xCoSGghht+rEK8/Gqn0XqdBGdgUgop+nep17edg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@ionic/cli-framework-output": "^2.2.1",
|
||||
@@ -2173,9 +2181,9 @@
|
||||
}
|
||||
},
|
||||
"@capacitor/core": {
|
||||
"version": "3.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.3.0.tgz",
|
||||
"integrity": "sha512-bKkg/IGALz5OKJPGwtGXoqi4JUXWbuILnZ9J12Mv21fPMFBoszYOiMfm7FqdcCwqcyJWCdG3SQDxCz0Q3e2y8Q==",
|
||||
"version": "3.3.2",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.3.2.tgz",
|
||||
"integrity": "sha512-pyI3dQdQjA1L5iEw0jkeKCogx9t5d5kIFTB5M3CJRg9Uj5MIpU2J5CRj+74A7BflvZJo8IBd6IfMJaOArRumaw==",
|
||||
"requires": {
|
||||
"tslib": "^2.1.0"
|
||||
}
|
||||
@@ -10223,6 +10231,11 @@
|
||||
"escape-string-regexp": "^1.0.5"
|
||||
}
|
||||
},
|
||||
"file-saver": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
|
||||
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
|
||||
},
|
||||
"file-uri-to-path": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
|
||||
@@ -16207,9 +16220,9 @@
|
||||
}
|
||||
},
|
||||
"bplist-parser": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz",
|
||||
"integrity": "sha512-zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA==",
|
||||
"version": "0.3.1",
|
||||
"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz",
|
||||
"integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"big-integer": "1.6.x"
|
||||
|
||||
+3
-2
@@ -31,12 +31,13 @@
|
||||
"@angular/platform-browser": "~12.1.2",
|
||||
"@angular/platform-browser-dynamic": "~12.1.2",
|
||||
"@angular/router": "~12.1.2",
|
||||
"@byteowls/capacitor-filesharer": "^3.0.0",
|
||||
"@capacitor-community/camera-preview": "^1.2.1",
|
||||
"@capacitor/android": "^3.3.2",
|
||||
"@capacitor/app": "^1.0.5",
|
||||
"@capacitor/browser": "1.0.6",
|
||||
"@capacitor/camera": "^1.2.0",
|
||||
"@capacitor/core": "^3.3.0",
|
||||
"@capacitor/core": "^3.3.2",
|
||||
"@capacitor/device": "^1.1.0",
|
||||
"@capacitor/filesystem": "^1.0.6",
|
||||
"@capacitor/haptics": "^1.1.2",
|
||||
@@ -151,7 +152,7 @@
|
||||
"@angular/compiler": "^12.1.2",
|
||||
"@angular/compiler-cli": "^12.1.2",
|
||||
"@angular/language-service": "^12.1.2",
|
||||
"@capacitor/cli": "^3.3.0",
|
||||
"@capacitor/cli": "^3.3.2",
|
||||
"@ionic/angular-toolkit": "^4.0.0",
|
||||
"@ionic/lab": "3.1.7",
|
||||
"@types/jasmine": "~3.6.0",
|
||||
|
||||
@@ -1,70 +1,34 @@
|
||||
|
||||
<!-- <div class="Rectangle"> -->
|
||||
<ion-content fullscreen>
|
||||
<ion-header translucent>
|
||||
<ion-toolbar>
|
||||
<div class="title-content width-100 d-flex justify-space-between align-center">
|
||||
<div class= "btn-dismiss font-30 cursor-pointer" (click)="close()">
|
||||
<ion-icon style="margin-bottom:-8px" slot="end" src="assets/images/icons-arrow-arrow-left.svg" class="iconsarrowarrow-left"></ion-icon>
|
||||
</div>
|
||||
<div class="middle d-flex align-center flex-grow-1">
|
||||
<div><b><ion-label class="digitalizacao_001pd">{{name}} </ion-label></b><br>
|
||||
<ion-label class="place">{{_updatedAt | date}}</ion-label></div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- <ion-text > <span class="digitalizacao_001pd">{{username}} {{_updatedAt | date}}</span></ion-text> -->
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<ion-card-content class="Bitmap" >
|
||||
|
||||
<img src="{{image}}" style="margin-top: 50%;"/>
|
||||
|
||||
</ion-card-content>
|
||||
<!-- <ion-footer class="Rectangle-Copy-5">
|
||||
|
||||
</ion-footer> -->
|
||||
</ion-content>
|
||||
|
||||
<ion-card class="cardconteudo" >
|
||||
|
||||
<ion-card-content >
|
||||
<ion-card-header >
|
||||
|
||||
|
||||
<ion-text color="dark" size="6">{{username}} <span>{{_updatedAt | date}}</span><div class="right" (click)="getIconGallery()"><ion-icon name="pencil-outline" ></ion-icon></div></ion-text>
|
||||
|
||||
|
||||
|
||||
</ion-card-header>
|
||||
|
||||
<img src="{{image}}" />
|
||||
|
||||
</ion-card-content>
|
||||
<!-- <image-cropper [imageBase64]="myimage"
|
||||
[maintainAspectRatio]="true"
|
||||
[aspectRatio]="4 / 3"
|
||||
outputType = "base64"
|
||||
format="png"
|
||||
[resizeToWidth]="true"
|
||||
(imageCropped)="imageCropped($event)"
|
||||
|
||||
></image-cropper> -->
|
||||
|
||||
<ion-footer color="light">
|
||||
<ion-row>
|
||||
<ion-col size="3" class="ion-text-center">
|
||||
<ion-button (click)="close()" fill="clear" color="light">
|
||||
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
|
||||
<ion-icon src="assets/icon/chat/circle-xmark-solid 1.svg" ></ion-icon>
|
||||
</ion-button>
|
||||
</ion-col>
|
||||
<ion-col size="3" class="ion-text-center">
|
||||
<ion-button (click)="deleteImage()" fill="clear" color="light">
|
||||
<ion-icon src="assets/icon/chat/Ellipse 8.svg" ></ion-icon>
|
||||
<!-- <ion-icon class="redla" name="flower-outline"></ion-icon> -->
|
||||
</ion-button>
|
||||
</ion-col>
|
||||
<ion-col size="3" class="ion-text-center">
|
||||
<ion-button (click)="redirPage()" fill="clear" color="light">
|
||||
|
||||
<ion-icon src="assets/icon/chat/Ellipselast.svg" ></ion-icon>
|
||||
|
||||
|
||||
</ion-button>
|
||||
</ion-col>
|
||||
<ion-col size="3" class="ion-text-center">
|
||||
|
||||
<ion-button (click)="getIconShare()" fill="clear" color="light">
|
||||
|
||||
|
||||
|
||||
<ion-icon src="assets/icon/chat/Ellipse 9.svg" ></ion-icon>
|
||||
|
||||
|
||||
</ion-button>
|
||||
|
||||
</ion-col>
|
||||
<!-- <ion-col size="3" class="ion-text-center">
|
||||
<ion-button (click)="zoom(true)" fill="clear" color="light">
|
||||
<ion-icon class="redla" name="alert-circle"></ion-icon>
|
||||
|
||||
</ion-button>
|
||||
</ion-col> -->
|
||||
</ion-row>
|
||||
</ion-footer>
|
||||
</ion-card>
|
||||
|
||||
@@ -36,25 +36,76 @@ float: right;
|
||||
}
|
||||
|
||||
|
||||
circle-xmark-solid{
|
||||
|
||||
// position: relative;
|
||||
width: 512px;
|
||||
height: 515px;
|
||||
position: absolute;
|
||||
left: 0%;
|
||||
right: 0%;
|
||||
top: 0%;
|
||||
bottom: 0%;
|
||||
|
||||
background: #FCD13A;
|
||||
|
||||
|
||||
ion-icon {
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.Rectangle {
|
||||
width: 400px;
|
||||
height: 666px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
border-top-left-radius: 25px;
|
||||
border-top-right-radius: 25px;
|
||||
box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.49);
|
||||
background-color: var(--white);
|
||||
|
||||
}
|
||||
|
||||
/* Vector */
|
||||
|
||||
|
||||
.digitalizacao_001pd {
|
||||
width: 238px;
|
||||
height: 29px;
|
||||
margin: 3px 3px 3px 0;
|
||||
font-family: Roboto;
|
||||
font-size: 20px;
|
||||
font-weight: normal;
|
||||
font-stretch: normal;
|
||||
font-style: normal;
|
||||
line-height: normal;
|
||||
letter-spacing: normal;
|
||||
color: var(--black);
|
||||
|
||||
}
|
||||
.iconsarrowarrow-left {
|
||||
width: 36px;
|
||||
height: 35px;
|
||||
padding: 9px 14px 8px 13px;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
|
||||
CSS
|
||||
.Rectangle-Copy-5 {
|
||||
width: 400px;
|
||||
height: 60px;
|
||||
margin: 43px 0 0;
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
|
||||
CSS
|
||||
.Bitmap {
|
||||
width: 358px;
|
||||
height: 506px;
|
||||
margin: 100px;
|
||||
}
|
||||
|
||||
.inside{
|
||||
background-color: var(--very-light-grey);
|
||||
}
|
||||
.place{
|
||||
float : left;
|
||||
font-size: 14px;
|
||||
|
||||
}
|
||||
.footer{
|
||||
background-color:transparent;
|
||||
}
|
||||
|
||||
.distance{
|
||||
margin-left: 100px;
|
||||
}
|
||||
@@ -22,7 +22,7 @@ export class PreviewCameraPage implements OnInit {
|
||||
|
||||
@ViewChild(IonSlides) slides : IonSlides
|
||||
image: any;
|
||||
username: string
|
||||
name: string
|
||||
_updatedAt: string
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ export class PreviewCameraPage implements OnInit {
|
||||
|
||||
ngOnInit() {
|
||||
this.image = this.navParams.get('image')
|
||||
this.username = this.navParams.get('username')
|
||||
this.name = this.navParams.get('username')
|
||||
this._updatedAt = this.navParams.get('_updatedAt')
|
||||
console.log(this.image)
|
||||
// this.image = this.myimage
|
||||
@@ -109,8 +109,6 @@ async getIconGallery(){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
async getIconShare(){
|
||||
|
||||
@@ -118,7 +116,7 @@ async getIconShare(){
|
||||
await Share.share({
|
||||
title: 'See cool stuff',
|
||||
text: 'Really awesome thing you need to see right meow',
|
||||
url: this.image,
|
||||
url: "https://www.google.com/search?q=joao+louren%C3%A7o&rlz=1C1SQJL_pt-PTAO977AO977&sxsrf=AOaemvIEvXz_WiqNNapjaoE42Q8b71jtiA:1638355797910&source=lnms&tbm=isch&sa=X&sqi=2&ved=2ahUKEwjo9uX6tsL0AhXTlWoFHX1XAtcQ_AUoAXoECAMQAw&biw=1920&bih=937&dpr=1#imgrc=lH5UYZyhPKBhHM",
|
||||
dialogTitle: 'Share with buddies',
|
||||
});
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
this.getFromDB();
|
||||
//this.getFromDB();
|
||||
|
||||
const pathname = window.location.pathname
|
||||
let realoadCounter = 0
|
||||
@@ -243,7 +243,7 @@ export class AgendaPage implements OnInit {
|
||||
this.segment = "Combinado";
|
||||
}
|
||||
if (realoadCounter != 0) {
|
||||
//this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
}
|
||||
realoadCounter++;
|
||||
}
|
||||
@@ -514,7 +514,8 @@ export class AgendaPage implements OnInit {
|
||||
this.CalendarStore.pushEvent(response, 'md');
|
||||
|
||||
console.log('CALENDAR STORE', this.CalendarStore.eventSource)
|
||||
this.trasnformData(response,'md');
|
||||
this.listToPresent = this.CalendarStore.eventSource
|
||||
this.trasnformData(response, 'md');
|
||||
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -537,11 +538,14 @@ export class AgendaPage implements OnInit {
|
||||
else if (this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') {
|
||||
|
||||
this.eventService.getAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
|
||||
this.addEventToDB(response, "pr");
|
||||
|
||||
this.CalendarStore.removeRange(startTime, endTime, 'pr')
|
||||
// calendar
|
||||
this.CalendarStore.pushEvent(response, 'pr');
|
||||
this.trasnformData(response,'pr');
|
||||
|
||||
this.listToPresent = this.CalendarStore.eventSource
|
||||
|
||||
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -555,9 +559,9 @@ export class AgendaPage implements OnInit {
|
||||
}).catch((error) => {
|
||||
this.getFromDB()
|
||||
})
|
||||
.finally(() => {
|
||||
this.showLoader = false;
|
||||
})
|
||||
.finally(() => {
|
||||
this.showLoader = false;
|
||||
})
|
||||
|
||||
}
|
||||
else if (this.loggeduser.Profile == 'PR') {
|
||||
@@ -571,7 +575,8 @@ export class AgendaPage implements OnInit {
|
||||
// startTime = 1, endTime = 31
|
||||
this.CalendarStore.removeRange(startTime, endTime, 'pr')
|
||||
this.CalendarStore.pushEvent(response, 'pr');
|
||||
this.trasnformData(response,'pr')
|
||||
|
||||
this.listToPresent = this.CalendarStore.eventSource
|
||||
|
||||
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
@@ -603,13 +608,15 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
|
||||
|
||||
this.addEventToDB(response, "md");
|
||||
let eventsList = response;
|
||||
|
||||
this.CalendarStore.removeRange(startTime, endTime, 'md')
|
||||
|
||||
// loop
|
||||
this.CalendarStore.pushEvent(eventsList, 'md');
|
||||
this.trasnformData(response,'md')
|
||||
|
||||
this.listToPresent = this.CalendarStore.eventSource
|
||||
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -628,22 +635,25 @@ export class AgendaPage implements OnInit {
|
||||
}).catch((error) => {
|
||||
this.getFromDB()
|
||||
})
|
||||
.finally(() => {
|
||||
counter++;
|
||||
if (counter == 2) {
|
||||
this.showLoader = false;
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
counter++;
|
||||
if (counter == 2) {
|
||||
this.showLoader = false;
|
||||
}
|
||||
})
|
||||
|
||||
this.eventService.getAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
|
||||
|
||||
this.addEventToDB(response, "pr");
|
||||
let eventsList = response;
|
||||
|
||||
// clear the current month only
|
||||
/* this.CalendarStore.removeRange(startTime, endTime, 'pr')
|
||||
this.CalendarStore.removeRange(startTime, endTime, 'pr')
|
||||
|
||||
|
||||
this.CalendarStore.pushEvent(eventsList, 'pr');
|
||||
this.listToPresent = this.CalendarStore.eventSource
|
||||
|
||||
this.CalendarStore.pushEvent(eventsList, 'pr'); */
|
||||
this.trasnformData(response,'pr')
|
||||
|
||||
this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -663,18 +673,19 @@ export class AgendaPage implements OnInit {
|
||||
}).catch((error) => {
|
||||
this.getFromDB()
|
||||
})
|
||||
.finally(() => {
|
||||
counter++;
|
||||
if (counter == 2) {
|
||||
this.showLoader = false;
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
counter++;
|
||||
if (counter == 2) {
|
||||
this.showLoader = false;
|
||||
}
|
||||
})
|
||||
|
||||
} else {
|
||||
|
||||
// view PR calendar with PR profile
|
||||
this.eventService.getAllPrEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
|
||||
|
||||
this.addEventToDB(response, "pr");
|
||||
let eventsList;
|
||||
if (this.segment == 'Oficial') {
|
||||
eventsList = response.filter(data => data.CalendarName == "Oficial");
|
||||
@@ -688,7 +699,7 @@ export class AgendaPage implements OnInit {
|
||||
this.CalendarStore.removeRange(startTime, endTime, 'pr')
|
||||
|
||||
this.CalendarStore.pushEvent(eventsList, 'pr');
|
||||
this.trasnformData(eventsList,'pr')
|
||||
this.listToPresent = this.CalendarStore.eventSource
|
||||
|
||||
this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -708,18 +719,19 @@ export class AgendaPage implements OnInit {
|
||||
}).catch((error) => {
|
||||
this.getFromDB()
|
||||
})
|
||||
.finally(() => {
|
||||
if (counter == 1 || this.loggeduser.Profile == 'PR') {
|
||||
this.showLoader = false;
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
if (counter == 1 || this.loggeduser.Profile == 'PR') {
|
||||
this.showLoader = false;
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
trasnformData(response,profile) {
|
||||
trasnformData(response, profile) {
|
||||
console.log('Transform ', response)
|
||||
response.forEach(element => {
|
||||
let event = {
|
||||
startTime: new Date(element.StartDate),
|
||||
@@ -736,6 +748,25 @@ export class AgendaPage implements OnInit {
|
||||
console.log('LIST TO PRESET', this.listToPresent)
|
||||
}
|
||||
|
||||
//Deve ser removido para ficar só um method transform
|
||||
trasnformDataDB(response) {
|
||||
console.log('Transform ', response)
|
||||
response.forEach(element => {
|
||||
let event = {
|
||||
startTime: new Date(element.StartDate),
|
||||
endTime: new Date(element.EndDate),
|
||||
allDay: false,
|
||||
event: element,
|
||||
calendarName: element.CalendarName,
|
||||
profile: element.Profile,
|
||||
id: element.EventId,
|
||||
}
|
||||
this.array.push(event)
|
||||
});
|
||||
this.listToPresent = this.array;
|
||||
console.log('LIST TO PRESET', this.listToPresent)
|
||||
}
|
||||
|
||||
addEventToDB(response, profile) {
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
} else {
|
||||
@@ -756,7 +787,7 @@ export class AgendaPage implements OnInit {
|
||||
Profile: profile
|
||||
}
|
||||
this.sqliteservice.addEvent(event)
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -767,7 +798,8 @@ export class AgendaPage implements OnInit {
|
||||
this.sqliteservice.getAllEvents().then((events: any[]) => {
|
||||
console.log('ALL EVENTS FROM DB', events)
|
||||
let eventArray = [];
|
||||
this.trasnformData(events,this.profile)
|
||||
|
||||
this.trasnformDataDB(events)
|
||||
this.updateEventListBox()
|
||||
|
||||
this.myCal.update();
|
||||
@@ -816,7 +848,7 @@ export class AgendaPage implements OnInit {
|
||||
case "Oficial":
|
||||
|
||||
if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {})
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
|
||||
|
||||
} else {
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -41,13 +41,11 @@ export class EditEventPage implements OnInit {
|
||||
recurringTypes: any;
|
||||
selectedRecurringType: any;
|
||||
|
||||
|
||||
loadedEventAttachments: Attachment[] = [];
|
||||
taskParticipants: any = [];
|
||||
taskParticipantsCc: any = [];
|
||||
adding: "intervenient" | "CC" = "intervenient";
|
||||
|
||||
|
||||
showAttendees = false;
|
||||
|
||||
constructor(
|
||||
@@ -196,19 +194,22 @@ export class EditEventPage implements OnInit {
|
||||
this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
|
||||
|
||||
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
|
||||
if(this.initCalendarName != this.postEvent.CalendarName){
|
||||
|
||||
if(this.initCalendarName != this.postEvent.CalendarName) {
|
||||
|
||||
let body = {
|
||||
"EventId": this.postEvent.EventId,
|
||||
"CalendarDestinationName": this.postEvent.CalendarName,
|
||||
}
|
||||
try {
|
||||
await this.eventsService.changeAgenda(body).toPromise();
|
||||
} catch (error) {}
|
||||
finally {
|
||||
this.goBack();
|
||||
}
|
||||
try {
|
||||
await this.eventsService.changeAgenda(body).toPromise();
|
||||
} catch (error) {}
|
||||
finally {
|
||||
this.goBack();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
this.toastService.successMessage();
|
||||
|
||||
}, error => {
|
||||
|
||||
@@ -198,7 +198,7 @@ ion-menu{
|
||||
.attach-title-item{
|
||||
width: 100%;
|
||||
font-size: 15px;
|
||||
color:var(--title-text-color);
|
||||
color: var(--title-text-color);
|
||||
}
|
||||
/* SPAN */
|
||||
.span-left{
|
||||
|
||||
@@ -633,7 +633,7 @@ touchStart(card) {
|
||||
cssClass: 'transparent-modal',
|
||||
componentProps: {
|
||||
image: img.attachments[0].image_url,
|
||||
username: img.u.username,
|
||||
username: img.u.name,
|
||||
_updatedAt: img._updatedAt
|
||||
}
|
||||
});
|
||||
|
||||
@@ -643,10 +643,10 @@ touchStart(card) {
|
||||
async openPreview(msg) {
|
||||
const modal = await this.modalController.create({
|
||||
component: PreviewCameraPage,
|
||||
cssClass: 'transparent-modal',
|
||||
cssClass: 'modal modal-desktop',
|
||||
componentProps: {
|
||||
image: msg.attachments[0].image_url,
|
||||
username: msg.u.username,
|
||||
username: msg.u.name,
|
||||
_updatedAt: msg._updatedAt,
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -126,7 +126,6 @@ export class PublicationDetailPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
|
||||
async editPost(publicationType:any) {
|
||||
console.log(this.publication);
|
||||
const modal = await this.modalController.create({
|
||||
|
||||
@@ -10,13 +10,13 @@ import { SearchList } from 'src/app/models/search-document';
|
||||
import { ProcessesService } from '../processes.service';
|
||||
import { ToastService } from '../toast.service';
|
||||
import { Camera, CameraResultType, CameraSource, Photo} from '@capacitor/camera';
|
||||
|
||||
import { Filesystem, Directory } from '@capacitor/filesystem';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
|
||||
|
||||
const IMAGE_DIR = 'stored-images';
|
||||
|
||||
|
||||
interface LocalFile {
|
||||
name: string;
|
||||
path: string;
|
||||
@@ -261,13 +261,6 @@ export class FileService {
|
||||
if (image) {
|
||||
await this.saveImage(image,roomId)
|
||||
}
|
||||
/* const response = await fetch(capturedImage.webPath!);
|
||||
const blob = await response.blob();
|
||||
|
||||
this.photos.unshift({
|
||||
filepath: "soon...",
|
||||
webviewPath: capturedImage.webPath
|
||||
}); */
|
||||
|
||||
//this.capturedImage = this.capturedImage;
|
||||
|
||||
@@ -287,6 +280,8 @@ export class FileService {
|
||||
if (capturedImage) {
|
||||
await this.saveImage(capturedImage,roomId)
|
||||
}
|
||||
|
||||
|
||||
/* const response = await fetch(capturedImage.webPath!);
|
||||
const blob = await response.blob();
|
||||
|
||||
@@ -320,6 +315,24 @@ export class FileService {
|
||||
//loader.remove();
|
||||
});
|
||||
*/ }
|
||||
async shareLocalFile(){
|
||||
this.http.get('./assets/any.svg', {responseType: 'blob'}).subscribe(res=>{
|
||||
const reader = new FileReader()
|
||||
reader.onloadend=()=>{
|
||||
const result = reader.result as string
|
||||
const base64Data = result.split(',')[1]
|
||||
|
||||
/* FileSharer.share({
|
||||
filename:'any.pdf',
|
||||
base64Data,
|
||||
contentType: "application/pdf",
|
||||
}) */
|
||||
reader.readAsDataURL(res)
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
addPictureToChat(roomId) {
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@ ion-content{
|
||||
.attach-title-item{
|
||||
width: 100%;
|
||||
font-size: 15px;
|
||||
color:#0d89d1;
|
||||
color: var(--title-text-color);
|
||||
}
|
||||
/* SPAN */
|
||||
.span-left{
|
||||
|
||||
@@ -14,7 +14,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
|
||||
import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-edit-event',
|
||||
templateUrl: './edit-event.page.html',
|
||||
@@ -127,6 +126,7 @@ export class EditEventPage implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
this.initCalendarName = this.postEvent.CalendarName;
|
||||
|
||||
this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments)
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ ion-content{
|
||||
.attach-title-item{
|
||||
width: 100%;
|
||||
font-size: 15px;
|
||||
color:#0d89d1;
|
||||
color:var(--title-text-color);
|
||||
}
|
||||
/* SPAN */
|
||||
.span-left{
|
||||
|
||||
@@ -216,19 +216,19 @@ export class DespachosOptionsPage implements OnInit {
|
||||
Attachments: DocumentToSave,
|
||||
}
|
||||
|
||||
if(actionName == 'Executado'){
|
||||
if(actionName == 'Executado') {
|
||||
await this.executado(res.data.note, docs);
|
||||
}
|
||||
else if(actionName == 'Arquivar'){
|
||||
await this.arquivar(res.data.note, docs);
|
||||
}
|
||||
else if(actionName == 'Gerar Diploma'){
|
||||
else if(actionName == 'Gerar Diploma') {
|
||||
await this.generateDiploma(res.data.note, docs);
|
||||
}
|
||||
else if(actionName == 'Concluido'){
|
||||
else if(actionName == 'Concluido') {
|
||||
//this.concluir(res.data.note, docs);
|
||||
}
|
||||
else if(actionName == 'Reexecução'){
|
||||
else if(actionName == 'Reexecução') {
|
||||
await this.reexecutar(res.data.note, docs);
|
||||
}
|
||||
this.goBack();
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
</div>
|
||||
<div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
|
||||
<div class="flex-grow-1">
|
||||
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
|
||||
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
|
||||
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
|
||||
<div class="solid"></div>
|
||||
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
||||
|
||||
Binary file not shown.
+2
-2
@@ -1340,12 +1340,12 @@ ngx-mat-datetime-content{
|
||||
.ldio-rpinwye8j0b div { box-sizing: content-box; }
|
||||
|
||||
.transparent-modal {
|
||||
--background: #f1eaeae7;
|
||||
--background:transparent;
|
||||
--margin: 0;
|
||||
--padding: 0;
|
||||
|
||||
ion-content {
|
||||
--background:#f1f0ebe7;
|
||||
--background:transparent;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
<script type="text/javascript" src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script> -->
|
||||
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js" integrity="sha512-U5C477Z8VvmbYAoV4HDq17tf4wG6HXPC6/KM9+0/wEXQQ13gmKY2Zb0Z2vu0VNUWch4GlJ+Tl/dfoLOH4i2msw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||
|
||||
<!-- <script src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
|
||||
<!-- <script src="node_modules/ibm-mfp-web-sdk/ibmmfpf.js"></script>
|
||||
<script src="node_modules/ibm-mfp-web-sdk/ibmmfpfanalytics.js"></script> -->
|
||||
<!-- <script src="assets/js/index.js"></script> -->
|
||||
<link rel="manifest" href="assets/manifest.json">
|
||||
|
||||
@@ -715,6 +715,10 @@ body {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.desk{
|
||||
color: black !important;
|
||||
}
|
||||
}
|
||||
|
||||
.gov {
|
||||
@@ -794,6 +798,10 @@ body {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.desk{
|
||||
color: black !important;
|
||||
}
|
||||
}
|
||||
|
||||
// blue
|
||||
@@ -913,6 +921,7 @@ body {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.font-awesome {
|
||||
|
||||
Reference in New Issue
Block a user