Project

General

Profile

« Previous | Next » 

Revision 51382

Added by Myrto Koukouli about 6 years ago

minor changes in forms

View differences:

modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-forms/datasource-update-form.component.html
31 31 
    <form-inline [description]="issnDesc" [valid]="updateGroup.get('issn').valid">
32 32 
      <span *ngIf="updateGroup.get('issn').invalid && updateGroup.get('issn').touched && updateGroup.get('issn').dirty"
33 33 
            class="help-block inline"
34 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Issn length has to be 8 characters</span>
34 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Issn needs to be of the form: "1111-1111"</span>
35 35 
      <input formControlName="issn" class="form-control" type="text" (focus)="updateGroup.get('issn').markAsUntouched()" (blur)="updateGroup.get('issn').updateValueAndValidity()">
36 36 
    </form-inline>
37 37 
    <form-inline [description]="eissnDesc" [valid]="updateGroup.get('eissn').valid">
38 38 
      <span *ngIf="updateGroup.get('eissn').invalid && updateGroup.get('eissn').touched && updateGroup.get('eissn').dirty"
39 39 
            class="help-block inline"
40 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Eissn length has to be 8 characters</span>
40 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Eissn needs to be of the form: "1111-1111"</span>
41 41 
      <input formControlName="eissn"class="form-control" type="text" (focus)="updateGroup.get('eissn').markAsUntouched()" (blur)="updateGroup.get('eissn').updateValueAndValidity()">
42 42 
    </form-inline>
43 43 
    <form-inline [description]="lissnDesc" [valid]="updateGroup.get('lissn').valid">
44 44 
      <span *ngIf="updateGroup.get('lissn').invalid && updateGroup.get('lissn').touched && updateGroup.get('lissn').dirty"
45 45 
            class="help-block inline"
46 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Lissn length has to be 8 characters</span>
46 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Lissn needs to be of the form: "1111-1111"</span>
47 47 
      <input formControlName="lissn"class="form-control" type="text" (focus)="updateGroup.get('lissn').markAsUntouched()" (blur)="updateGroup.get('lissn').updateValueAndValidity()">
48 48 
    </form-inline>
49 49 
  </div>
......
100 100 
  <h4 class="uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium"
101 101 
      uk-scrollspy-class="">Administrator & contact information</h4>
102 102 
  <form-inline [description]="adminEmailDesc" [valid]="updateGroup.get('adminEmail').valid">
103 
    <input formControlName="adminEmail" class="form-control" type="text">
103 
    <span *ngIf="updateGroup.get('adminEmail').invalid && updateGroup.get('adminEmail').touched && updateGroup.get('adminEmail').dirty"
104 
          class="help-block inline"
105 
          style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">You need to enter a valid email address</span>
106 
    <input formControlName="adminEmail" class="form-control" type="text" (focus)="updateGroup.get('adminEmail').markAsUntouched()" (blur)="updateGroup.get('adminEmail').updateValueAndValidity()">
104 107 
  </form-inline>
105 108 
  <div *ngIf="showButton" class="form-group">
106 109 
    <button class="uk-button uk-button-primary updateRepoInfoButton" type="button" (click)="updateRepo()">Update Information</button>
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-forms/datasource-create-form.component.html
24 24 
    <form-inline [description]="issnDesc" [valid]="group.get('issn').valid">
25 25 
      <span *ngIf="group.get('issn').invalid && group.get('issn').touched && group.get('issn').dirty"
26 26 
            class="help-block inline"
27 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Issn length has to be 8 characters</span>
27 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Issn needs to be of the form: "1111-1111"</span>
28 28 
      <input formControlName="issn" class="form-control" type="text" (focus)="group.get('issn').markAsUntouched()" (blur)="group.get('issn').updateValueAndValidity()">
29 29 
    </form-inline>
30 30 
    <form-inline [description]="eissnDesc" [valid]="group.get('eissn').valid">
31 31 
      <span *ngIf="group.get('eissn').invalid && group.get('eissn').touched && group.get('eissn').dirty"
32 32 
            class="help-block inline"
33 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Eissn length has to be 8 characters</span>
33 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Eissn needs to be of the form: "1111-1111"</span>
34 34 
      <input formControlName="eissn"class="form-control" type="text" (focus)="group.get('eissn').markAsUntouched()" (blur)="group.get('eissn').updateValueAndValidity()">
35 35 
    </form-inline>
36 36 
    <form-inline [description]="lissnDesc" [valid]="group.get('lissn').valid">
37 37 
      <span *ngIf="group.get('lissn').invalid && group.get('lissn').touched && group.get('lissn').dirty"
38 38 
            class="help-block inline"
39 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Lissn length has to be 8 characters</span>
39 
            style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">Lissn needs to be of the form: "1111-1111"</span>
40 40 
      <input formControlName="lissn"class="form-control" type="text" (focus)="group.get('lissn').markAsUntouched()" (blur)="group.get('lissn').updateValueAndValidity()">
41 41 
    </form-inline>
42 42 
  </div>
......
94 94 
  <h4 class="uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium"
95 95 
      uk-scrollspy-class="">Administrator & contact information</h4>
96 96 
  <form-inline [description]="adminEmailDesc" [valid]="group.get('adminEmail').valid">
97 
    <input formControlName="adminEmail" class="form-control" type="text">
97 
    <span *ngIf="group.get('adminEmail').invalid && group.get('adminEmail').touched && group.get('adminEmail').dirty"
98 
          class="help-block inline"
99 
          style="margin-top: 0px; margin-bottom: 0px; padding-left: 10px;">You need to enter a valid email address</span>
100 
    <input formControlName="adminEmail" class="form-control" type="text"
101 
           (focus)="group.get('adminEmail').markAsUntouched()"
102 
           (blur)="group.get('adminEmail').updateValueAndValidity()">
98 103 
  </form-inline>
99 104 
  <div *ngIf="showButton" class="form-group">
100 105 
    <button class="uk-button uk-button-primary updateRepoInfoButton" type="button" (click)="registerDatasource()">Update Information</button>
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-forms/datasource-update-form.component.ts
66 66 
    softwarePlatform : '',
67 67 
    platformName : '',
68 68 
    officialName : ['', Validators.required],
69 
    issn : ['', Validators.minLength(8)],
70 
    eissn : ['', Validators.minLength(8)],
71 
    lissn : ['', Validators.minLength(8)],
69 
    issn : ['', [Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$')] ],
70 
    eissn : ['', Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$') ],
71 
    lissn : ['', Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$') ],
72 72 
    repoDescription : ['', Validators.required],
73 73 
    country : ['', Validators.required],
74 74 
    longtitude : ['', [Validators.required, Validators.min(-180), Validators.max(180)] ],
......
163 163 
      this.updateGroup.get('websiteUrl').disable();
164 164 
      this.updateGroup.get('institutionName').disable();
165 165 
      if (this.selectedRepo.datasourceType == 'journal') {
166 
        this.updateGroup.get('issn').setValue(this.selectedRepo.issn);
166 
        let ssnToShow = this.selectedRepo.issn.slice(0, 4)+ '-' + this.selectedRepo.issn.toString().slice(4);
167 
        this.updateGroup.get('issn').setValue(ssnToShow);
168 
        if (this.selectedRepo.eissn) {
169 
          ssnToShow = this.selectedRepo.eissn.slice(0, 4)+ '-' + this.selectedRepo.eissn.toString().slice(4);
170 
          this.updateGroup.get('eissn').setValue(ssnToShow);
171 
        }
172 
        if (this.selectedRepo.eissn) {
173 
          ssnToShow = this.selectedRepo.lissn.slice(0, 4)+ '-' + this.selectedRepo.lissn.toString().slice(4);
174 
          this.updateGroup.get('lissn').setValue(ssnToShow);
175 
        }
167 176 
        this.updateGroup.get('issn').disable();
168 
        this.updateGroup.get('eissn').setValue(this.selectedRepo.eissn);
169 177 
        this.updateGroup.get('eissn').disable();
170 
        this.updateGroup.get('lissn').setValue(this.selectedRepo.lissn);
171 178 
        this.updateGroup.get('lissn').disable();
172 179 
      }
173 180 
      this.getDatasourceClasses();
......
295 302 
    this.selectedRepo.datasourceClass = this.updateGroup.get('datasourceType').value;
296 303 
    this.selectedRepo.contactEmail = this.updateGroup.get('adminEmail').value;
297 304 
    if (this.selectedRepo.datasourceType == 'journal') {
298 
        this.selectedRepo.issn = this.updateGroup.get('issn').value;
299 
        this.selectedRepo.eissn = this.updateGroup.get('eissn').value;
300 
        this.selectedRepo.lissn = this.updateGroup.get('lissn').value;
305 
      let ssnParts = this.updateGroup.get('issn').value.split('-');
306 
      let correctSSN = ssnParts[0]+ssnParts[1];
307 
      this.selectedRepo.issn = correctSSN;
308 
      if ( this.updateGroup.get('eissn').value ) {
309 
        ssnParts = this.updateGroup.get('eissn').value.split('-');
310 
        correctSSN = ssnParts[0]+ssnParts[1];
311 
        this.selectedRepo.eissn = correctSSN;
312 
      }
313 
      if ( this.updateGroup.get('lissn').value ) {
314 
        ssnParts = this.updateGroup.get('lissn').value.split('-');
315 
        correctSSN = ssnParts[0]+ssnParts[1];
316 
        this.selectedRepo.lissn = correctSSN;
317 
      }
301 318 
    }
302 319 
    if (!this.showButton) {
303 320 
      this.selectedRepo.registeredBy = this.authService.getUserEmail();
modules/uoa-repository-dashboard-gui/trunk/app/pages/sources/sources-forms/datasource-create-form.component.ts
60 60 
  readonly groupDefinition = {
61 61 
    softwarePlatform : '',
62 62 
    officialName : ['', Validators.required],
63 
    issn : ['', Validators.minLength(8)],
64 
    eissn : ['', Validators.minLength(8)],
65 
    lissn : ['', Validators.minLength(8)],
63 
    issn : ['', [Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$')] ],
64 
    eissn : ['', Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$') ],
65 
    lissn : ['', Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$') ],
66 66 
    repoDescription : ['', Validators.required],
67 67 
    country : ['', Validators.required],
68 68 
    longtitude : ['', [Validators.required, Validators.min(-180), Validators.max(180)] ],
......
219 219 
    newRepo.datasourceClass = this.group.get('datasourceType').value;
220 220 
    newRepo.typology = this.group.get('softwarePlatform').value;
221 221 
    newRepo.description = this.group.get('repoDescription').value;
222 
    newRepo.issn = this.group.get('issn').value;
223 
    newRepo.eissn = this.group.get('eissn').value;
224 
    newRepo.lissn = this.group.get('lissn').value;
222 

  		




  
  223
  
    
    if ( this.group.get('issn').value ){


  		




  
  224
  
    
      let ssnParts = this.group.get('issn').value.split('-');


  		




  
  225
  
    
      let correctSSN = ssnParts[0]+ssnParts[1];


  		




  
  226
  
    
      newRepo.issn = correctSSN;


  		




  
  227
  
    
      if ( this.group.get('eissn').value ) {


  		




  
  228
  
    
        ssnParts = this.group.get('eissn').value.split('-');


  		




  
  229
  
    
        correctSSN = ssnParts[0]+ssnParts[1];


  		




  
  230
  
    
        newRepo.eissn = correctSSN;


  		




  
  231
  
    
      }


  		




  
  232
  
    
      if ( this.group.get('lissn').value ) {


  		




  
  233
  
    
        ssnParts = this.group.get('lissn').value.split('-');


  		




  
  234
  
    
        correctSSN = ssnParts[0]+ssnParts[1];


  		




  
  235
  
    
        newRepo.lissn = correctSSN;


  		




  
  236
  
    
      }


  		




  
  237
  
    
    }


  		




  
  238
  
    

  		




  225
  239
  
    
    newRepo.registeredBy = this.authService.getUserEmail();


  		




  226
  240
  
    

  		




  227
  241
  
    
    /* THE BELOW FIELDS ARE NOT SET IN GWT CODE*/


  		












  

    
      modules/uoa-repository-dashboard-gui/trunk/app/services/authentication.service.ts
    
  





  36
  36
  
    
    this.isLoggedIn = false;


  		




  37
  37
  
    
    const baseUrl = appBaseUrl;


  		




  38
  38
  
    
    console.log('logging out, going to:');


  		




  39
  
  
    
    console.log(`https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo='${window.location}'`);


  		




  40
  
  
    
    /*this.router.navigateByUrl(`https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo='${baseUrl}'`);*/


  		




  41
  
  
    
    window.location.href = `https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=${window.location.origin}`;


  		




  42
  
  
    
/*    window.location.replace(`https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=http://194.177.192.121.xip.io:3000`);*/


  		




  
  39
  
    
    /*console.log(`https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo='${window.location}'`);


  		




  
  40
  
    
    window.location.href = `https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=${window.location.origin}`;*/


  		




  
  41
  
    
    console.log(`https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo='${window.location}'`);


  		




  
  42
  
    
    window.location.href = `https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=${window.location.origin}`;


  		




  43
  43
  
    
  }


  		




  44
  44
  
    

  		




  45
  45
  
    
  public tryLogin() {


  		












  

    
      modules/uoa-repository-dashboard-gui/trunk/app/shared/reusablecomponents/repository-tiles.component.html
    
  





  26
  26
  
    

  		




  27
  27
  
    
      <!--TILES VIEW-->


  		




  28
  28
  
    
      <div *ngIf="tilesView && reposOfUser.length" class="uk-grid-large uk-grid-margin-large uk-grid repos-grid">


  		




  29
  
  
    
        <div *ngFor="let repo of reposOfUser" class="uk-width-expand@m uk-first-column">


  		




  
  29
  
    
        <div *ngFor="let repo of reposOfUser" class="uk-width-expand@m uk-first-column uk-margin-bottom" style="min-width: 300px;">


  		




  30
  30
  
    
          <div class="uk-margin uk-grid-match uk-child-width-1-1 uk-grid-small uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-slide-top-medium uk-grid-stack">


  		




  31
  31
  
    
            <div class="uk-first-column">


  		




  32
  32
  
    
              <div>


  		




  33
  33
  
    
                <a class="el-link" [routerLink]="[getLinkToNext(repo)]">


  		




  34
  34
  
    
                  <div class="el-item uk-panel uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="">


  		




  35
  35
  
    
                    <div class="uk-child-width-expand uk-grid-medium uk-flex-middle uk-grid uk-grid-stack" uk-grid="">


  		




  36
  
  
    
                      <div class="uk-width-1-3@m uk-first-column">


  		




  
  36
  
    
                      <div class="uk-width-1-3@m uk-first-column" style="width: 80px;">


  		




  37
  37
  
    
                        <img *ngIf="!repo.logoUrl" class="el-image uk-border-rounded" src="/assets/imgs/yourLogoHere.jpg" alt="">


  		




  38
  38
  
    
                        <img *ngIf="repo.logoUrl" class="el-image uk-border-rounded" src="{{ repo.logoUrl }}" alt="">


  		




  39
  39
  
    
                      </div>


  		












Also available in:  Unified diff