chant componets

2026-04-18 12:37:53 +00:00 · 2023-08-23 11:19:51 +01:00
parent b81e876dde
commit 3d00f33d4c
17 changed files with 29 additions and 109 deletions
@@ -34,7 +34,7 @@
    <div *ngIf="members">
      <ion-label class="members-label">Contactos selecção:</ion-label>
      <div class="members-list" *ngFor="let user of members">
-        <ion-item-sliding>
+        <ion-item-sliding [class.inactive]="sessionStore.user.UserName == user.username">
          <ion-item lines="none" class="members-checkbox ion-no-border ion-no-padding">
            <ion-checkbox checked disabled color="primary"></ion-checkbox>
            <p>{{user.name}}</p>
@@ -43,7 +43,7 @@
          <ion-item-options (click)="deleteMember(user)" class="members-options" side="end">
            <ion-item-option color="danger">Apagar</ion-item-option>
          </ion-item-options>
-      </ion-item-sliding>
+        </ion-item-sliding>
      </div>
    </div>

@@ -136,7 +136,7 @@
     .item-checkbox p, .members-checkbox p{
         display: block;
         margin: 0 !important;
-         width: 330px;
+
         padding-left: 10px;
         font-size: rem(15);
         color: var(--title-text-color);
@@ -165,4 +165,9 @@
      }
   }
 
- 
+   .inactive {
+    opacity: 0.7;
+    ion-item-options {
+      display: none !important;
+    }
+  }
@@ -894,7 +894,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
        componentProps: {
          isCreated: this.isGroupCreated,
          room: this.room,
-          members: this.members,
+          members: this.ChatSystemService.getGroupRoom(this.roomId).members,
          name: this.room.name,
        },
        cssClass: 'contacts',
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AnimationController, ModalController } from '@ionic/angular';
+import { ActivatedRoute } from '@angular/router';
+import { ModalController } from '@ionic/angular';
 import { Publication } from 'src/app/models/publication';
 import { PublicationsService } from 'src/app/services/publications.service';
 import { ToastService } from 'src/app/services/toast.service';
@@ -38,9 +38,9 @@
    <div class="members" *ngIf="members">
      <ion-label class="members-label">Contactos selecção:</ion-label>
      <ion-list class="members-list" *ngFor="let user of members">
-        <div class="members-checkbox">
+        <div class="members-checkbox" [class.inactive]="sessionStore.user.UserName == user.username">
          <ion-checkbox disabled checked color="primary"></ion-checkbox>
-          <p class="ma-0">{{user.name}}</p>
+          <p class="ma-0">{{user.name }}</p>
          <ion-icon  class="{{user.status}}" name="ellipse"></ion-icon>
          <button (click)="deleteMember(user)" class="btn-no-color detele-item-icon">
            <ion-icon color="danger" name="close"></ion-icon>
@@ -49,7 +49,6 @@
      </ion-list>
    </div>

-
    <div *ngFor="let userContainer of userContainer | keyvalue;" >

      <div class="item-divider">
@@ -176,4 +176,9 @@
    }
   }
 
- 
+.inactive {
+  opacity: 0.7;
+  button {
+    display: none !important;
+  }
+}
@@ -39,7 +39,7 @@ export class GroupContactsPage implements OnInit {

  objectUserSingleStone = []
  userContainer = {}
-
+  
  constructor(
    private modalController: ModalController,
    private chatService: ChatService,
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { GroupContactsPage } from './group-contacts.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: GroupContactsPage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class GroupContactsPageRoutingModule {}
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { GroupContactsPageRoutingModule } from './group-contacts-routing.module';
-
-import { GroupContactsPage } from './group-contacts.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    GroupContactsPageRoutingModule
-  ],
-  declarations: [GroupContactsPage]
-})
-export class GroupContactsPageModule {}
@@ -1,9 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>group-contacts</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-
-</ion-content>
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { GroupContactsPage } from './group-contacts.page';
-
-describe('GroupContactsPage', () => {
-  let component: GroupContactsPage;
-  let fixture: ComponentFixture<GroupContactsPage>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ GroupContactsPage ],
-      imports: [IonicModule.forRoot()]
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(GroupContactsPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-group-contacts',
-  templateUrl: './group-contacts.page.html',
-  styleUrls: ['./group-contacts.page.scss'],
-})
-export class GroupContactsPage implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
@@ -11,12 +11,7 @@ const routes: Routes = [
  {
    path: 'contacts',
    loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
-  },
-  {
-    path: 'group-contacts',
-    loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule)
  }
-
 ];

@NgModule({
@@ -10,7 +10,7 @@
  <div class="buttons">
    <button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
    <button (click)="leaveGroup()" class="btn-cancel" shape="round">Sair do Grupo</button>
-    <button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round">Alterar
+    <button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" style="min-width: 192px;">Alterar
      nome do grupo</button>
    <div class="solid"></div>
    <button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round">Cancelar</button>
@@ -134,6 +134,7 @@ export class PublicationDetailPage implements OnInit {

      if(error.status == 404) {
        this.publicationFolderService.deletePost(this.folderId, this.publicationId)
+        this.goBackToViewPublications.emit();
      }

      this.httpErrorHandle.httpStatusHandle(error)
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "a06bc4a40",
-  "SHA": "a06bc4a409dab223870433cd26d557b78ea5a8d3",
+  "shortSHA": "b81e876dd",
+  "SHA": "b81e876dde292253892cf233ec9b38a1c211a385",
  "branch": "developer-prod",
  "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Aug 22 17:50:18 2023 +0100'",
-  "lastCommitMessage": "s",
-  "lastCommitNumber": "5204",
+  "lastCommitTime": "'Wed Aug 23 09:55:14 2023 +0100'",
+  "lastCommitMessage": "Publication",
+  "lastCommitNumber": "5205",
  "change": "",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/events/events.page.scss\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified:   src/app/store/publication-folder.service.ts",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified:   src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified:   src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tdeleted:    src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts\n\tdeleted:    src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts\n\tdeleted:    src/app/shared/chat/new-group/group-contacts/group-contacts.page.html\n\tdeleted:    src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss\n\tdeleted:    src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts\n\tdeleted:    src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts\n\tmodified:   src/app/shared/chat/new-group/new-group-routing.module.ts\n\tmodified:   src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts",
  "changeAuthor": "peter.maquiran"
 }