Project

General

Profile

« Previous | Next » 

Revision 51657

Added by Konstantina Galouni about 6 years ago

1. Use modal from library for confirmation of entity toggling ('<modal-form #okModal>' changed to '<modal-alert>').
2. Remove from 'modal-form.component' case where type is 'none' and no formGroup is given as input (used only for entity toggling confirmation).
3. fab.component.ts: Add event emitter on click.
4. Replace button for 'new' functionality with fab component.

View differences:

entities.component.html
23 23 
                    </div>
24 24 
                </div>
25 25 
            </div>
26 
            <a (click)="showModal()" *ngIf="isPortalAdministrator" class="uk-button uk-button-primary uk-float-right"><i></i> New Entity </a>
26 
            <!-- <a (click)="showModal()" *ngIf="isPortalAdministrator" class="uk-button uk-button-primary uk-float-right"><i></i> New Entity </a> -->
27 27 
            <form target="BSFormPanel_Admin_1" class="search">
28 28 
                <input #inputstring (keyup.enter)="filterBySearch(inputstring.value)" placeholder="Entity name..." type="text" class="uk-input uk-width-medium"/>
29 29 
                <button class="uk-button" type="submit">Search</button>
......
93 93 
                </div>
94 94 
            </div>
95 95 
        </div>
96 
        <fab *ngIf="isPortalAdministrator" (clicked)="showModal()"></fab>
97 
        <!-- <fab *ngIf="isPortalAdministrator" (clicked)="newEntity()"></fab> -->
96 98 
</div>
97 99 
<modal-form #saveModal [saveText]="'Save'" [titleText]="'Add a new Entity'" [formGroup]="formGroup" [type]="'entity'"
98 100 
            [isModalShown]="isModalShown" (emmitObject)="entitySavedSuccessfully($event)" (emmitError)="handleError($event)">
......
103 105 
            [isModalShown]="isModalShown" (emmitObject)="entityUpdatedSuccessfully($event)" (emmitError)="handleError($event)">
104 106 
    <entity-form [group]="formGroup"></entity-form>
105 107 
</modal-form>
106 
<modal-form #okModal [saveText]="'OK'" [titleText]="'Warning'" [type]="'none'"
107 
            [isModalShown]="isModalShown" (emmitObject)="continueToggling($event)" (emmitError)="handleError($event)">
108 
            This action will affect all search pages related to this entity!
109 
            Pages' status will change to entity's status!
110 
            Do you want to continue?
111 
<modal-form>
112 
<!-- <delete-confirmation-dialog #deleteConfirmationModal [isModalShown]="isModalShown" (emmitObject)="confirmedDeleteEntities($event)">
113 
    Are you sure you want to delete the selected entity(-ies)?
114 
</delete-confirmation-dialog> -->
108 

  		




  
  109
  
    
<!-- <modal-alert #AlertModalSaveEntity (alertOutput)="entitySaveConfirmed($event)">


  		




  
  110
  
    
  <div *ngIf="modalErrorMessage" class="uk-alert-danger" uk-alert aria-hidden="true">{{ modalErrorMessage }}</div>


  		




  
  111
  
    
  <entity-form [group]="formGroup"></entity-form>


  		




  
  112
  
    
</modal-alert>


  		




  
  113
  
    

  		




  
  114
  
    
<modal-alert #AlertModalUpdateEntity (alertOutput)="entityUpdateConfirmed($event)">


  		




  
  115
  
    
  <entity-form [group]="formGroup"></entity-form>


  		




  
  116
  
    
</modal-alert> -->


  		




  
  117
  
    

  		




  
  118
  
    
<modal-alert #AlertModalRelatedPages (alertOutput)="continueToggling($event)"></modal-alert>


  		




  
  119
  
    

  		




  115
  120
  
    
<modal-alert #AlertModalDeleteEntities (alertOutput)="confirmedDeleteEntities($event)"></modal-alert>


  		












Also available in:  Unified diff