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

update

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-15 12:03:37 +01:00
parent 30aba9b182
commit 20c53993bf
8 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+4
View File
@@ -235,6 +235,10 @@ export class AgendaPage implements OnInit {
this.tigerUpdate()
window['reloadCalendar'] = () => {
this.reloadCalendar()
}
}
src/app/pages/agenda/edit-event/edit-event.page.ts
+8
View File
@@ -353,6 +353,10 @@ export class EditEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
if(window['reloadCalendar']) {
window['reloadCalendar']()
}
if(this.initCalendarName != this.postEvent.CalendarName) {
let body = {
@@ -375,6 +379,10 @@ export class EditEventPage implements OnInit {
} else {
this.eventsService.editEvent(this.postEvent, 2, 3, this.postEvent.CalendarId).subscribe(async () => {
if(window['reloadCalendar']) {
window['reloadCalendar']()
}
if(this.initCalendarName != this.postEvent.CalendarName) {
let body = {
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+23 -4
View File
@@ -147,18 +147,37 @@ export class GroupContactsPage implements OnInit {
this.modalController.dismiss();
}
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 = 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
}
src/app/pages/publications/new-publication/new-publication.page.html
+1 -4
View File
@@ -99,10 +99,7 @@
</button>
</ion-buttons>
<ion-buttons slot="end">
<button *ngIf="publicationType == '2' || publicationType == '1'" class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Criar</ion-label>
</button>
<button *ngIf="publicationType == '3'" class="btn-ok" fill="clear" color="#fff" (click)="save()">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Gravar</ion-label>
</button>
</ion-buttons>
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+24 -5
View File
@@ -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(){
src/app/shared/publication/new-publication/new-publication.page.html
+1 -1
View File
@@ -107,7 +107,7 @@
</ion-buttons>
<ion-buttons slot="end">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Criar</ion-label>
<ion-label>Gravar</ion-label>
</button>
</ion-buttons>
</ion-toolbar>
src/global.scss
+11 -10
View File
@@ -1143,14 +1143,6 @@ background: rgb(92, 92, 92);
}
}
ngx-mat-datetime-content{
.actions {
.mat-button-disabled {
background-color: #ff5a5a59 !important;
}
}
}
// angular material inputs
@@ -1491,7 +1483,6 @@ ngx-mat-datetime-content .actions {
}
}
ngx-mat-datetime-content .ngx-mat-timepicker {
z-index: 111;
}
@@ -1499,10 +1490,20 @@ ngx-mat-datetime-content .ngx-mat-timepicker {
display: none !important;
}
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;
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "4f4381a6d",
"SHA": "4f4381a6d7f9fb23cc31a0a57d4d1bcce86bb204",
"shortSHA": "30aba9b18",
"SHA": "30aba9b182c15ea7321fc807156acacacc2d383e",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Aug 14 21:43:52 2023 +0100'",
"lastCommitMessage": "fix errors",
"lastCommitNumber": "5157",
"lastCommitTime": "'Tue Aug 15 10:15:08 2023 +0100'",
"lastCommitMessage": "improve",
"lastCommitNumber": "5158",
"change": "",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\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/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\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: version/git-version.ts",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\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/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
}