-
-
+
+
{{publicationTitle}}
Campos marcados com * são obrigatórios
- Campos marcados com * são obrigatórios
+
-
- Fotografia Anexada
+
+ Fotografia Anexada
-
-
+
+
-
+
-
- ![]()
-
-
-
-
-
-
{{capturedImageTitle}}
-size
-
+
+
+
+
+
+
+ {{capturedImageTitle}}
+size
+
+
+
-
-
-
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss
index 2a9427312..2fa8e3f03 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.scss
+++ b/src/app/pages/publications/new-publication/new-publication.page.scss
@@ -55,9 +55,11 @@ ion-toolbar{
background: #ffffff;
height: 100%;
box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6);
- padding: 25px 20px 0 20px;
overflow: auto;
}
+.padding{
+ padding: 25px 20px 0 20px;
+}
.title-content{
margin: 0px auto;
padding: 0 !important;
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 51acf78e0..b9e15b1cc 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -125,6 +125,7 @@ export class NewPublicationPage implements OnInit {
this.convertBlobToBase64Worker.postMessage(blob);
this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
this.capturedImage = oEvent.data
+ this.capturedImageTitle = 'foto'
}
}
@@ -186,6 +187,7 @@ export class NewPublicationPage implements OnInit {
this.convertBlobToBase64Worker.postMessage(blob);
this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
this.capturedImage = oEvent.data
+ this.capturedImageTitle = 'foto'
}
@@ -357,6 +359,7 @@ export class NewPublicationPage implements OnInit {
}
clear() {
+ this.capturedImageTitle = '';
this.capturedImage = '';
}
@@ -375,30 +378,6 @@ export class NewPublicationPage implements OnInit {
}
}
- /* async openGallery() {
- const modal = await this.modalController.create({
- component: GalleryPage,
- componentProps:{
- },
- cssClass: 'new-publication',
- backdropDismiss: false
- });
- await modal.present();
- modal.onDidDismiss();
- } */
-
- /* async takePicture(){
- const image = await Plugins.Camera.getPhoto({
- quality: 100,
- allowEditing: false,
- resultType: CameraResultType.DataUrl,
- source: CameraSource.Camera
- });
-
-
- this.photo = this.sanitizer.bypassSecurityTrustResourceUrl(image && (image.dataUrl));
- } */
-
async selectImage() {
const image = await Camera.getPhoto({
quality: 90,
@@ -453,26 +432,6 @@ export class NewPublicationPage implements OnInit {
});
await loading.present();
- /* Filesystem.readdir({
- path: `${IMAGE_DIR}/${fileName}`,
- directory: Directory.Data,
- }).then(result => {
-
- let lastphoto = result.files[result.files.length - 1]
- this.loadFileData(lastphoto);
- },
- async (err) => {
-
- // Folder does not yet exists!
- await Filesystem.mkdir({
- path: IMAGE_DIR,
- directory: Directory.Data,
- recursive: true
- });
- }
- ).then(_ => {
- loading.dismiss();
- }); */
}
async loadFileData(fileName: string) {
@@ -506,22 +465,6 @@ export class NewPublicationPage implements OnInit {
}
- /* compressImage() {
- let image = this.capturedImage;
- this.imageCompress.compressFile(image, orientation, 50, 50,).then(() => {
-
- this.imgResultBeforeCompress = image;
-
-
- this.imageCompress.compressFile(image, orientation, 50, 50).then(
- result => {
- this.imgResultAfterCompress = result;
-
- }
- );
- })
- } */
-
compressFile() {
//this.imgResultBeforeCompress = image;s
@@ -538,5 +481,7 @@ export class NewPublicationPage implements OnInit {
}
-
+ deletePublicationImage() {
+ this.publication.FileBase64 = ""
+ }
}
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index de3410cf0..6c5c85cc7 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -199,7 +199,7 @@ export class ChatSystemService {
}
}
- async getAllRooms () {
+ async getAllRooms (callback:Function = () =>{} , roomIdCallback = "") {
this.loadingWholeList = true
var rooms;
@@ -295,7 +295,13 @@ export class ChatSystemService {
rooms.result.update[index]['membersExcludeMe'] = users
await this.prepareRoom(roomData);
}
+
}
+
+ if(roomId == roomIdCallback) {
+ callback()
+ }
+
index++;
}
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index 85ea6cd63..12283484b 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -108,9 +108,6 @@ export class TaskService {
return false
}
- const deadline = new Date(isoDateString)
- const plusOneDeadline = deadline.getDate() + 1
- deadline.setDate(plusOneDeadline)
return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy')
}
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index 77e4c4d77..7dd8027bb 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -235,20 +235,39 @@ export class GroupContactsPage implements OnInit {
}
}
- onChange(event){
+ onChange(event) {
this.textSearch = event.detail.value;
- this.users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => {
- if(a.name < b.name){
+ const users: any[] = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => {
+ if(a.name < b.name) {
return -1;
}
- if(a.name > b.name){
+ if(a.name > b.name) {
return 1;
}
return 0;
});
-
+ const selectedUsers = this.users.filter( e => e?.isChecked == true)
+
+ users.forEach( (user, index) => {
+ if(user[index]) {
+ console.log({user, index})
+ const isCheck = selectedUsers.find( e => e._id == user._id)?.isChecked
+ if(isCheck) {
+ user[index].isChecked = isCheck
+ }
+
+ // if(user[index].isChecked) {
+ // console.log('user[index].isChecked', user[index].isChecked)
+ // }
+ }
+
+ })
+
+ this.users = users
+
+ // console.log('this.users', this.users)
}
clicked(){
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index 1622ef118..d43a49411 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -22,7 +22,6 @@
-
@@ -30,7 +29,7 @@
{{publication.OriginalFileName}}.{{publication.FileExtension}}
- 75 Kb
+
-
@@ -101,10 +99,7 @@
X
+
+
-
+
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 4a7168408..681b0ff0f 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -21,6 +21,7 @@ export class ContactsPage implements OnInit {
room:any;
dm:any;
sessionStore = SessionStore
+ loading = false
@Input() roomId: string;
@Output() openMessage:EventEmitter = new EventEmitter();
@@ -67,10 +68,19 @@ export class ContactsPage implements OnInit {
let body = {
username: username,
}
+
+ this.loading = true
this.chatService.createRoom(body).subscribe(res => {
- this.ChatSystemService.getAllRooms();
this.room = res['room'];
- this.openMessage.emit(this.room._id);
+
+ this.ChatSystemService.getAllRooms(() => {
+ this.openMessage.emit(this.room._id);
+
+ this.loading = false
+ }, this.room._id);
+
+ }, ()=> {
+ this.loading = false
});
}
}
diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
index c36c0dbfd..2f6b4d610 100644
--- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
+++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
@@ -1,5 +1,5 @@
-
-
+
+
@@ -7,7 +7,7 @@
-
+
@@ -99,7 +107,7 @@
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 5671ea3f8..89f89425f 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -93,7 +93,7 @@ export class NewPublicationPage implements OnInit {
});
this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String;
- this.capturedImageTitle = capturedImage.path;
+ this.capturedImageTitle = 'foto';
//
}
@@ -105,7 +105,7 @@ export class NewPublicationPage implements OnInit {
});
this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String;
- this.capturedImageTitle = capturedImage.path;
+ this.capturedImageTitle = 'foto';
}
@@ -272,10 +272,15 @@ export class NewPublicationPage implements OnInit {
this.goBack();
}
- clear(){
+ clear() {
+ this.capturedImageTitle = '';
this.capturedImage = '';
}
+ deletePublicationImage() {
+ this.publication.FileBase64 = ""
+ }
+
setTitle(){
if(this.publicationType == '1') {
this.publicationTitle = 'Nova Publicação Rápida';
diff --git a/src/global.scss b/src/global.scss
index cf0d964c4..b04fe890e 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1143,14 +1143,6 @@ background: rgb(92, 92, 92);
}
}
-ngx-mat-datetime-content{
- .actions {
- .mat-button-disabled {
- background-color: #ff5a5a59 !important;
- }
- }
-
-}
// angular material inputs
@@ -1503,6 +1495,16 @@ ngx-mat-datetime-content .ngx-mat-timepicker {
ngx-mat-datetime-content .mat-input-element {
padding: 0px !important;
}
+
+ngx-mat-datetime-content{
+ .actions {
+ .mat-button-disabled {
+ background-color: #ff5a5a59 !important;
+ }
+ }
+
+}
+
pre {
font-family: 'Roboto' !important;
font-size: rem(16) !important;
diff --git a/version/git-version.ts b/version/git-version.ts
index 4a8908fe6..689f7843b 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "ae2701cbc",
- "SHA": "ae2701cbcd02b0d0331f13927bc26d36d0752167",
+ "shortSHA": "61a2b78ee",
+ "SHA": "61a2b78eeca3ec5cfd5481cec2b5c5f36eb727ae",
"branch": "developer",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Tue Aug 15 12:44:53 2023 +0100'",
- "lastCommitMessage": "pull made",
- "lastCommitNumber": "5160",
+ "lastCommitTime": "'Tue Aug 15 18:09:03 2023 +0100'",
+ "lastCommitMessage": "Search solved, aprove envent and remove from home the serviceworker",
+ "lastCommitNumber": "5161",
"change": "",
- "changeStatus": "On branch developer\nYour branch is ahead of 'origin/developer' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss\n\tmodified: src/app/pages/search/search.page.scss\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: version/git-version.ts",
+ "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 4 and 7 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.module.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/global.scss",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index 9a69f55b3..c56c31771 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -29,39 +29,47 @@
-
+
- Fotografia Anexada
-
-
-
-
-
-
+ Fotografia Anexada
+
+
+
+
+ {{capturedImageTitle}}
-size
-
+
+
+
+
+
+
+
+
-
+ {{capturedImageTitle}}
+size
+
+
+
-
-
+
+
+
+
+
+
+
+
+ {{publication.OriginalFileName}}.{{publication.FileExtension}}
+size
+
-
-
-
-
-
-
-
- {{publication.OriginalFileName}}.{{publication.FileExtension}}
- 75 Kb
-
-
- X
-