Merge branch 'master' into deploy

youstinus · May 28, 2019 · 8540e5e · 8540e5e
2 parents 5392874 + 6f3741e
commit 8540e5e
Show file tree

Hide file tree

Showing 36 changed files with 930 additions and 271 deletions.
diff --git a/README.md b/README.md
diff --git a/ionic-ui/src/app/constants/En.ts b/ionic-ui/src/app/constants/En.ts
@@ -65,6 +65,7 @@ export class En {
         loginUnSuccessfulEmail: 'Email has not sent.',
         loginWrongHeader: 'Something went wrong',
         loginWrongMessage: 'Invalid username or password!',
+        loginSuccessLogin: 'Successfuly signed in',
         //Registration page
         registrationTitle: 'Register to our page',
         registrationInformation: 'Your information',
@@ -103,6 +104,8 @@ export class En {
         projectEnd: 'Project ends',
         projectGoBack: 'Go back',
         projectHeader: 'Project page',
+        projectOpenInNewTab: 'Open in new tab',
+        projectClipBoard: 'Copy to clipboard',
         //Volunteers page
         volunteersHeader: 'Volunteers page',
         volunteersYourVolunteers: 'Your project volunteers',
@@ -131,7 +134,8 @@ export class En {
         newPojectCreate: 'Create',
         newPojectAlertNotHeader: 'Project was not created',
         newPojectAlertNotMessage: 'Please, fill in empty gaps',
-        newPojectAlertOk: 'OK',
+        newPojectAlertOk: 'Project created successfully',
+        newProjectFailedDates: 'Your end date is earlier than your start date',
         //Edit project
         editProjectDelete: 'DELETE',
         editProjectAlertEditHeader: 'Update failed',
@@ -172,17 +176,17 @@ export class En {
         cr21: 'Access to data',
         cr22: 'You have the right to request a copy of the information we hold about you. If you would like a copy of some or all your personal information, please follow the instructions at the end of this policy.',
         cr23: 'volunteering.ga user account information can be retrived by following these steps:',
-        cr24: '1.Visit https://login.volunteering.ga/, and enter your username and password.',
-        cr25: '2.Go to account settings.',
-        cr26: '3.Click “Send me my data”',
+        cr24: '1.Visit https://volunteering.ga/login, and enter your username and password.',
+        cr25: '2. Go to account settings.',
+        cr26: '3. Click “Send me my data”',
         cr27: 'Retention of personal information',
         cr28: 'We will retain your personal information on our systems only for as long as we need to, for the success of the TeamPlatypus project and the programs that support volunteering.ga. We keep contact information (such as mailing list information) until a user unsubscribes or requests that we delete that information from our live systems. If you choose to unsubscribe from a mailing list, we may keep certain limited information about you so that we may honor your request.',
         cr29: 'volunteering.ga will not delete personal data from logs or records necessary to the operation, development, or archives of the TeamPlatypus project.',
         cr30: 'volunteering.ga shall maintain attendee’s data for 3 months to better track and foster community growth, and then automatically delete non-essential data collected via registration. Attendee names and email addresses will be retained indefinitely, to preserve our ability to respond to code of conduct reports.',
         cr31: 'When deletion is requested or otherwise required, we will anonymise the data of data subjects and/or remove their information from publicly accessible sites if the deletion of data would break essential systems or damage the logs or records necessary to the operation, development, or archival records of the TeamPlatypus project.',
         cr32: 'If you would like to request deletion of your account and associated data, please follow these steps:',
         cr33: '1.Visit https://volunteering.ga/.',
-        cr34: '2.Login and go to settings.',
+        cr34: '2. Login and go to settings.',
         cr35: '3.Click “Request Permanent Account Deletion”.',
         cr36: 'Rights in relation to your information',
         cr37: 'You may have certain rights under data protection law in relation to the personal information we hold about you. In particular, you may have a right to:',
@@ -198,6 +202,8 @@ export class En {
         cr47: 'Although most changes are likely to be minor, volunteering.ga may change its Privacy Policy from time to time, and at volunteering.ga’s sole discretion. volunteering.ga encourages visitors to frequently check this page for any changes to its Privacy Policy. Your continued use of this site after any change in this Privacy Policy will constitute your acceptance of such change.',
         cr48: 'Contact',
         cr49: 'Please contact us if you have any questions about our privacy policy or information we hold about you by emailing [email protected].',
+        crVisit: '1. Visit',
+        crEnter: ', and enter your username and password.',
         // Volunteers settings page
         volSettingsHeader: 'Volunteer Settings',
         volSettingsImage: 'Your image url',
@@ -247,7 +253,11 @@ export class En {
         orgSettingsDeleteCancel: 'Cancel',
         orgSettingsDeleted: 'Account deleted',
         orgSettingsCannotGetOrganization: 'Cannot get volunteer from database',
-
+        orgRequiredField3: 'This field is required and must contain at least 3 letters',
+        orgRequiredEmail: 'This field is required and valid email must be provided',
+        orgCaution: 'Title, imageUrl and yours organization email is required in order to show your organization in organizations list',
+        orgSuccessUpdate: 'Information updated successfully',
+        orgFailUpdate: 'Information update failed',
         // Organization page
         orgHeader: 'Organization page',
         orgGoToProject: 'Go to project page',
@@ -259,16 +269,23 @@ export class En {
         orgProjects: 'Projects',
         orgNoComments: ' No comments yet',
         orgNoProjects: 'No projects yet',
-        // OrganizationS page
         orgsHeader: 'Organizations',
-
+        //Not found page
+        notFoundh2: ' Page not found',
+        notFoundpar: 'The page you are looking for might have been removed, had its name changed or is temporarily unavailable',
+        notFoundGoMain: 'Go To Main Page',
 
         // Toast messages
         toastDeletedSuccessfuly: 'Project deleted successfuly!',
         toastFailedToDelete: 'Failed to delete project!',
         toastUpdatedSuccessfuly: 'Project updated successfuly!',
         toastFailedToUpdate: 'Failed to update project!',
         toastEmailWasNotSent: 'Email was not sent!',
-        toastEmailWasSent: 'Email was sent!'
+        toastEmailWasSent: 'Email was sent!',
+
+        // Calendar page
+        calFrom: 'From',
+        calTo: 'To',
+        calToday: 'Today'
     }
 }
diff --git a/ionic-ui/src/app/constants/Lt.ts b/ionic-ui/src/app/constants/Lt.ts
@@ -65,6 +65,7 @@ export class Lt {
         loginUnSuccessfulEmail: 'Laiško nepavyko išsiųsti',
         loginWrongHeader: 'Prisijungti nepavyko',
         loginWrongMessage: 'Neteisingi prisijungimo vardas ir slaptažodis!',
+        loginSuccessLogin:'Sėkmingai prisijungėte svetainėje',
         //Registration page
         registrationTitle: 'Susikurkite vartotojo paskyrą',
         registrationInformation: 'Jūsų informacija',
@@ -103,6 +104,8 @@ export class Lt {
         projectEnd: 'Projektas baigsis',
         projectGoBack: 'Grįžti',
         projectHeader: 'Projekto puslapis',
+        projectOpenInNewTab: 'Atidaryti naujame lange',
+        projectClipBoard: 'Nukopijuoti į iškarpinę',
         //Volunteers page
         volunteersHeader: 'Savanorių puslpapis',
         volunteersYourVolunteers: 'Jūsų projekto savanoriai',
@@ -132,6 +135,7 @@ export class Lt {
         newPojectAlertNotHeader: 'Projektas nebuvo sukurtas',
         newPojectAlertNotMessage: 'Prašome užpildykite tuščius laukus',
         newPojectAlertOk: 'Gerai',
+        newProjectFailedDates: 'Jūsų projekto pabaigos data yra ankstesnė nei pradžios',
         //Edit project
         editProjectDelete: 'Ištrinti',
         editProjectAlertEditHeader: 'Atnaujinimas nepavyko',
@@ -144,7 +148,7 @@ export class Lt {
         changeLocation: 'Keisti vietovę',
         editSave: 'Išsaugoti pakeitimus',
         editSucesfull: 'Sėkmingai išsaugota',
-        editConfirmDelete: 'Ar tikrai norite ištrynti šį projektą?',
+        editConfirmDelete: 'Ar tikrai norite ištrinti šį projektą?',
         yes: 'Taip',
         no: 'Ne',
         //registrationSuccess: 'Vartotojas sėkmingai priregistruotas',
@@ -172,7 +176,7 @@ export class Lt {
         cr21: 'Prieiga prie duomenų',
         cr22: 'Jūs turite teisę prašyti informacijos, kurią mes laikome apie jus. Jei norite kopijuoti kai kurias ar visas savo asmeninę informaciją, vadovaukitės šios politikos pabaigoje pateiktomis instrukcijomis',
         cr23: 'savanoriškos informacijos apie naudotojo paskyros informaciją galima atgauti atlikus šiuos veiksmus:',
-        cr24: '1.Apsilankant https://login.volunteering.ga/ ir įveskite savo vartotojo vardą ir slaptažodį.',
+        cr24: '1.Apsilankant https://volunteering.ga/login ir įveskite savo vartotojo vardą ir slaptažodį.',
         cr25: '2.Prisijunkite prie paskyros nustatymų.',
         cr26: '3. Spustelėkite „Siųsti man mano duomenis“',
         cr27: 'Asmens informacijos saugojimas',
@@ -182,8 +186,8 @@ export class Lt {
         cr31: 'Jei ištrinti prašoma ar kitaip reikalaujama, mes anonimizuosime duomenų subjektų duomenis ir / arba pašalinsime jų informaciją iš viešai prieinamų svetainių, jei duomenų ištrynimas nutrauktų esmines sistemas arba pažeistų žurnalus ar įrašus, reikalingus veiklai, plėtrai ar archyvavimui „TeamPlatypus“ projekto įrašai.',
         cr32: 'Jei norite prašyti ištrinti paskyrą ir susijusius duomenis, atlikite šiuos veiksmus:',
         cr33: '1.Apsilankykite https://volunteering.ga/.',
-        cr34: '2.Prisijunkite ir eikite į nustatymus.',
-        cr35: '3.Paspauskite „Prašyti paskyros ištrynimo“.',
+        cr34: '2. Prisijunkite ir eikite į nustatymus.',
+        cr35: '3. Paspauskite „Prašyti paskyros ištrynimo“.',
         cr36: 'Su jūsų informacija susijusios teisės',
         cr37: 'Jūs galite turėti tam tikras teises pagal duomenų apsaugos įstatymus dėl asmeninės informacijos, kurią mes laikome apie jus. Visų pirma, jūs galite turėti teisę:',
         cr38: 'prašyti asmeninės informacijos, kurią mes laikome, kopiją;',
@@ -198,6 +202,8 @@ export class Lt {
         cr47: 'Nors dauguma pakeitimų gali būti nedideli, volunteering.ga kartais gali keisti savo privatumo politiką ir volunteering.ga skatina lankytojus dažnai patikrinti šį puslapį dėl bet kokių jo privatumo politikos pakeitimų. Jūsų tęstinis šio tinklalapio naudojimas po bet kokių šios privatumo politikos pakeitimų bus jūsų pritarimas tokiems pakeitimams.',
         cr48: 'Kontaktai',
         cr49: 'Prašome susisiekti su mumis, jei turite kokių nors klausimų apie mūsų privatumo politiką ar informaciją, kurią mes laikome apie jus elektroniniu paštu [email protected].',
+        crVisit: '1. Apsilankykite',
+        crEnter: ' ir įveskite savo vartotojo vardą ir slaptažodį',
         // Volunteers settings page
         volSettingsHeader: 'Savanario parametrų keitimas',
         volSettingsImage: 'Jūsų nuotraukos nuoroda',
@@ -216,7 +222,7 @@ export class Lt {
         changePassHeader: 'PASIKEISKITE SLAPTAŽODĮ',
         changePassFieldSet: 'Reikalinga informacija ',
         changePassEnterUserEmail: 'Įveskite vartotojo el-paštą',
-        changePassOldPassword: 'Senas password',
+        changePassOldPassword: 'Senas slaptažodis',
         changePassNewPassword: 'Naujas slaptažodis',
         changePassConfirmPassword: 'Patvirtinkite slaptažodį',
         changePassButton: 'Keisti slaptažodį',
@@ -248,7 +254,11 @@ export class Lt {
         orgSettingsDeleteCancel: 'Grįžti',
         orgSettingsDeleted: 'Paskyra ištrinta',
         orgSettingsCannotGetOrganization: 'Negalime užkrauti Jūsų duomenų iš duomenų bazės',
-
+        orgRequiredField3: 'Šis laukas yra privalomas ir turi būti sudarytas bent iš trijų simbolių',
+        orgRequiredEmail: 'Šis laukas yra privalomas ir validus el-pašto adresas turi būti pateiktas',
+        orgCaution: 'Pavadinimo, nuotraukos ir jūsų organizacijos el-paštas yra privalomi norint, kad jūsų organizacija būtų matoma organizacijų sąraše',
+        orgSuccessUpdate: 'Informacija sėkmingai atnaujinta',
+        orgFailUpdate: 'Informacijos atnaujinimas nepavyko',
         // Organization page
         orgHeader: 'Organizacijos puslapis',
         orgGoToProject: 'Eiti į projekto puslapį',
@@ -260,16 +270,23 @@ export class Lt {
         orgProjects: 'Projektai',
         orgNoComments: ' Komentarų nėra',
         orgNoProjects: 'Projektų nėra',
-        // OrganizationS page
         orgsHeader: 'Organizacijos',
-
+        //Not found page
+        notFoundh2: ' Puslapis nerastas',
+        notFoundpar: 'Puslapis, kurio ieškote, nerastas. Galbūt jis buvo ištrintas, pasikeitė jo pavadinimas arba jis tapo laikinai neprieinamas',
+        notFoundGoMain: 'Grįžkite į pagrindinį puslapį',
 
         // Toast messages
         toastDeletedSuccessfuly: 'Projektas sėkmingai pašalintas!',
         toastFailedToDelete: 'Projekto nepavyko pašalinti!',
         toastUpdatedSuccessfuly: 'Projektas sėkmingai atnaujintas!',
         toastFailedToUpdate: 'Projekto atnaujinti nepavyko!',
         toastEmailWasNotSent: 'Elektroninis laiškas nebuvo išsiųstas!',
-        toastEmailWasSent: 'Elektroninis laiškas sėkmingai išsiųstas!'
+        toastEmailWasSent: 'Elektroninis laiškas sėkmingai išsiųstas!',
+
+        // Calendar page
+        calFrom: 'Nuo',
+        calTo: 'Iki',
+        calToday: 'Šiandien'
     }
 }
diff --git a/ionic-ui/src/app/models/Lang.ts b/ionic-ui/src/app/models/Lang.ts
@@ -61,6 +61,7 @@ export class Lang {
     public loginUnSuccessfulEmail: string;
     public loginWrongHeader: string;
     public loginWrongMessage: string;
+    public loginSuccessLogin: string;
     //Registration page
     public registrationTitle: string;
     public registrationInformation: string;
@@ -99,6 +100,9 @@ export class Lang {
     public projectEnd: string;
     public projectGoBack: string;
     public projectHeader: string;
+    public projectClipBoard: string;
+    public projectOpenInNewTab: string;
+
     //Volunteers page
     public volunteersHeader: string;
     public volunteersYourVolunteers: string;
@@ -128,6 +132,7 @@ export class Lang {
     public newPojectAlertNotHeader: string;
     public newPojectAlertNotMessage: string;
     public newPojectAlertOk: string;
+    public newProjectFailedDates: string;
     //Edit project
     public editProjectDelete: string;
     public editProjectAlertEditHeader: string;
@@ -193,6 +198,8 @@ export class Lang {
     public cr47: string;
     public cr48: string;
     public cr49: string;
+    public crVisit: string;
+    public crEnter: string;
     // Volunteers settings page
     public volSettingsHeader: string;
     public volSettingsImage: string;
@@ -243,7 +250,11 @@ export class Lang {
     public orgSettingsAlertConfirm: string;
     public orgSettingsDeleted: string;
     public orgSettingsCannotGetOrganization: string;
-
+    public orgRequiredField3: string;
+    public orgRequiredEmail: string;
+    public orgCaution: string;
+    public orgSuccessUpdate: string;
+    public orgFailUpdate: string;
     //Organization page
     public orgHeader: string;
     public orgGoToProject: string;
@@ -255,9 +266,11 @@ export class Lang {
     public orgProjects: string;
     public orgNoComments: string;
     public orgNoProjects: string;
-    // OrganizationS page
     public orgsHeader: string;
-
+    //Not found page
+    public notFoundh2: string;
+    public notFoundpar: string;
+    public notFoundGoMain: string;
 
     // Toast messages
     public toastDeletedSuccessfuly: string;
@@ -266,4 +279,9 @@ export class Lang {
     public toastFailedToUpdate: string;
     public toastEmailWasNotSent: string;
     public toastEmailWasSent: string;
+
+    // Calendar page
+    public calFrom: string;
+    public calTo: string;
+    public calToday: string;
 }
diff --git a/ionic-ui/src/app/pages/calendar/calendar.page.html b/ionic-ui/src/app/pages/calendar/calendar.page.html
@@ -11,7 +11,7 @@
     <ion-col size="5">
       <p>
         <ion-buttons class="CC">
-          <ion-button (click)="today()">Today</ion-button>
+          <ion-button (click)="today()">{{calToday}}</ion-button>
         </ion-buttons>
       </p>
     </ion-col>

diff --git a/ionic-ui/src/app/pages/calendar/calendar.page.ts b/ionic-ui/src/app/pages/calendar/calendar.page.ts
@@ -7,20 +7,24 @@ import { Subscription } from 'rxjs';
 import { Project } from '../../models/Project';
 import { ProjectsService } from '../../services/projects.service';
 import { ActivatedRoute } from '@angular/router';
+import { Language } from 'src/app/utilities/Language';
 
 @Component({
   selector: 'app-calendar',
   templateUrl: './calendar.page.html',
   styleUrls: ['./calendar.page.scss'],
 })
 export class CalendarPage implements OnInit {
+  calfrom: string = Language.Lang.calFrom;
+  calto: string = Language.Lang.calTo;
+  calToday: string = Language.Lang.calToday;
   projects: Project[];
   events3: Project[];
   private subscription: Subscription;
   private type: String;
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
-  eventSource: { title: string, startTime: Date, endTime: Date, id: number }[] = [];
+  eventSource: { title: string, startTime: Date, endTime: Date, endTime2: Date, id: number }[] = [];
   constructor(public navCtrl: NavController, private projectsService: ProjectsService, private alertCtrl: AlertController, @Inject(LOCALE_ID) private locale: string, private route: ActivatedRoute) { }
   ngOnInit() {
     this.type = this.route.snapshot.params['type'];
@@ -39,11 +43,11 @@ export class CalendarPage implements OnInit {
   async onEventSelected(event) {
     // Use Angular date pipe for conversion
     let start = formatDate(event.startTime, 'medium', this.locale);
-    let end = formatDate(event.endTime, 'medium', this.locale);
+    let end = formatDate(event.endTime2, 'medium', this.locale);
     const alert = await this.alertCtrl.create({
       header: event.title,
       subHeader: event.desc,
-      message: 'Nuo: ' + start + '<br><br>Iki: ' + end,
+      message: this.calfrom + ': ' + start + '<br><br>' + this.calto + ': ' + end,
       buttons: [{
         text: "Details",
         handler: () => {
@@ -90,7 +94,8 @@ export class CalendarPage implements OnInit {
           title: value.title,
           startTime: new Date(value.start),
           endTime: new Date(value.start), // #EDITED TO START BECAUSE THERE IS TOO MUCH OF SPAM IN CALENDAR
-          id: value.id
+          id: value.id,
+          endTime2: new Date(value.end)
         });
       });
       this.myCal.loadEvents();

diff --git a/ionic-ui/src/app/pages/change-password/change-password.page.html b/ionic-ui/src/app/pages/change-password/change-password.page.html
@@ -17,7 +17,7 @@ <h2 no-margin class="h2">
       </legend>
 
       <!-- Change password form -->
-      <form [formGroup]="changePasswordForm" class="list-form">
+      <form [formGroup]="changePasswordForm" class="list-form" (keyup.enter)="onSubmit()">
 
         <div *ngIf="(role!=4)">
           <ion-item no-padding class="animated fadeInUp">
@@ -73,14 +73,8 @@ <h2 no-margin class="h2">
       </form>
     </fieldset>
 
-    <div margin-top *ngIf="forgotPass">
-      <ion-button icon-left size="medium" expand="full" shape="round" color="dark" (click)="resetPassword()"
-        [disabled]="!changePasswordForm.valid" tappable>
-        {{changePassButton}}
-      </ion-button>
-    </div>
-    <div margin-top *ngIf="!forgotPass">
-      <ion-button icon-left size="medium" expand="full" shape="round" color="dark" (click)="changePassword()"
+    <div margin-top>
+      <ion-button icon-left size="medium" expand="full" shape="round" color="dark" (click)="onSubmit()"
         [disabled]="!changePasswordForm.valid" tappable>
         {{changePassButton}}
       </ion-button>

diff --git a/ionic-ui/src/app/pages/change-password/change-password.page.ts b/ionic-ui/src/app/pages/change-password/change-password.page.ts
@@ -106,6 +106,14 @@ export class ChangePasswordPage implements OnInit {
     }
   }
 
+  onSubmit() {
+    if(this.forgotPass){
+      this.resetPassword();
+    } else {
+      this.changePassword();
+    }
+  }
+
   resetPassword() {
     var passwords = this.changePasswordForm.value;
     if (passwords.password == passwords.password1) {