Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/youstinus/volunteer
Browse files Browse the repository at this point in the history
  • Loading branch information
@youstinus
youstinus committed May 19, 2019
2 parents 3bcd3fc + 1f5645a commit ac061d1
Show file tree
Hide file tree
Showing 9 changed files with 577 additions and 762 deletions.
307 changes: 168 additions & 139 deletions ionic-ui/src/app/pages/organization/organization.page.html
View file

Large diffs are not rendered by default.

439 changes: 196 additions & 243 deletions ionic-ui/src/app/pages/organization/organization.page.ts
View file

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions ionic-ui/src/app/pages/organizations-settings/organizations-settings.page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@

<form [formGroup]="onSaveForm" class="list-form">
<ion-card>
<!--<img src='{{volunteer.imageUrl}}' style="height: 200px; width: 200px"/>
<ion-button shape ="round" (click)="onChangePic()">Change picture </ion-button>
<ion-label color="dark" position="floating">Your image url</ion-label>
<ion-input type="text" formControlName="imageUrl"></ion-input> -->
<ion-card-header>
<ion-card class="myCard" lines="none">
<img [src]="organization.imageUrl" (error)="updateUrl($event)" class="center"
style="height: 200px; width: 400px;" />
style="height: 200px; width: 400px;"/>
<ion-card-content>
<ion-item lines="none">
<ion-label color="dark" position="floating">{{orgSettingsImage}}</ion-label>
Expand Down Expand Up @@ -71,11 +67,12 @@ <h1>{{orgSettingsDescription}}:</h1>
</ion-button>
<ion-card-content>

<ion-button (click)="onChangePass()" style = "font-size: 12px" size="small" color="dark" shape="round" >
<ion-button (click)="onChangePass()" style="font-size: 12px" size="small" color="dark" shape="round">
{{orgSettingsChangePass}}
</ion-button>

<ion-button style=" float: right; font-size: 12px" size="small" color="dark" shape="round" (click)="onDelete()" >
<ion-button style=" float: right; font-size: 12px" size="small" color="dark" shape="round"
(click)="onDelete()">
{{orgSettingsDeleteAcc}}
</ion-button>

Expand Down
345 changes: 147 additions & 198 deletions ionic-ui/src/app/pages/organizations-settings/organizations-settings.page.ts
View file
Original file line number Diff line number Diff line change
@@ -1,214 +1,163 @@
import { Component, OnInit } from '@angular/core';
import {Organization} from "../../models/Organization";
import {OrganizationsService} from "../../services/organizations.service";
import {ActivatedRoute} from "@angular/router";
import {Component, OnInit} from '@angular/core';
import {Organization} from '../../models/Organization';
import {OrganizationsService} from '../../services/organizations.service';
import {ActivatedRoute} from '@angular/router';
import {UsersService} from '../../services/users.service';
import {AlertController, NavController} from '@ionic/angular';
import {User} from "../../models/User";
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import {Volunteer} from "../../models/Volunteer";
import {VolunteersService} from "../../services/volunteers.service";
import {Strings} from "../../constants/Strings";
import {text} from "@angular/core/src/render3";
import {Language} from "../../utilities/Language";
import {FormGroup, FormBuilder, Validators} from '@angular/forms';
import {Language} from '../../utilities/Language';

@Component({
selector: 'app-organizations-settings',
templateUrl: './organizations-settings.page.html',
styleUrls: ['./organizations-settings.page.scss'],
selector: 'app-organizations-settings',
templateUrl: './organizations-settings.page.html',
styleUrls: ['./organizations-settings.page.scss'],
})


export class OrganizationsSettingsPage implements OnInit {

orgSettingsHeader: string = Language.Lang.orgSettingsHeader;
orgSettingsImage: string = Language.Lang.orgSettingsImage;
orgSettingsWebsite: string = Language.Lang.orgSettingsWebsite;
orgSettingsTitle: string = Language.Lang.orgSettingsTitle;
orgSettingsAddress: string = Language.Lang.orgSettingsAddress;
orgSettingsPhone: string = Language.Lang.orgSettingsPhone;
orgSettingsEmail: string = Language.Lang.orgSettingsEmail;
orgSettingsDescription: string = Language.Lang.orgSettingsDescription;
orgSettingsSaveChanges: string = Language.Lang.orgSettingsSaveChanges;
orgSettingsAlertSuccess: string = Language.Lang.orgSettingsAlertSuccess;
orgSettingsAlertFail: string = Language.Lang.orgSettingsAlertFail;
orgSettingsChangePass: string = Language.Lang.orgSettingsChangePass;
orgSettingsDeleteAcc: string = Language.Lang.orgSettingsDeleteAcc;
orgSettingsDeleteAalert: string = Language.Lang.orgSettingsDeleteAalert;
orgSettingsDeleteConfirm: string = Language.Lang.orgSettingsDeleteConfirm;
orgSettingsDeleteButton:string = Language.Lang.orgSettingsDeleteButton;
orgSettingsAlertConfirm: string = Language.Lang.orgSettingsAlertConfirm;
orgSettingsDeleteCancel: string = Language.Lang.orgSettingsDeleteCancel;
orgSettingsDeleted: string = Language.Lang.orgSettingsDeleted;



user: number;
public onSaveForm: FormGroup;
organization: Organization = new Organization();
defaulUrl: string = 'https://cdn.80000hours.org/wp-content/uploads/2012/11/AAEAAQAAAAAAAAUbAAAAJDZiMjcxZmViLTNkMzItNDhlNi1hZDg4LWM5NzI3MzA4NjMxYg.jpg';

constructor(
private organizationService: OrganizationsService,
private route: ActivatedRoute,
private usersService: UsersService,
private navCtrl: NavController,
private formBuilder: FormBuilder,
public alertCtrl: AlertController) {
}

ngOnInit() {
this.onSaveForm = this.formBuilder.group({
'imageUrl': [null, Validators.nullValidator],
'title': [null, Validators.nullValidator],
'address': [null, Validators.nullValidator],
'phone': [null, Validators.nullValidator],
'website': [null, Validators.nullValidator],
'description': [null, Validators.nullValidator],
'userId': this.usersService.getTokenId()
});
this.user = this.usersService.getTokenId();
if (this.user === null) {
this.navCtrl.navigateRoot('main').catch(e => console.log(e));
orgSettingsHeader: string = Language.Lang.orgSettingsHeader;
orgSettingsImage: string = Language.Lang.orgSettingsImage;
orgSettingsWebsite: string = Language.Lang.orgSettingsWebsite;
orgSettingsTitle: string = Language.Lang.orgSettingsTitle;
orgSettingsAddress: string = Language.Lang.orgSettingsAddress;
orgSettingsPhone: string = Language.Lang.orgSettingsPhone;
orgSettingsDescription: string = Language.Lang.orgSettingsDescription;
orgSettingsSaveChanges: string = Language.Lang.orgSettingsSaveChanges;
orgSettingsChangePass: string = Language.Lang.orgSettingsChangePass;
orgSettingsDeleteAcc: string = Language.Lang.orgSettingsDeleteAcc;
orgSettingsDeleteAalert: string = Language.Lang.orgSettingsDeleteAalert;
orgSettingsDeleteConfirm: string = Language.Lang.orgSettingsDeleteConfirm;
orgSettingsDeleteButton: string = Language.Lang.orgSettingsDeleteButton;
orgSettingsAlertConfirm: string = Language.Lang.orgSettingsAlertConfirm;
orgSettingsDeleteCancel: string = Language.Lang.orgSettingsDeleteCancel;
orgSettingsDeleted: string = Language.Lang.orgSettingsDeleted;

user: number;
public onSaveForm: FormGroup;
organization: Organization = new Organization();
defaulUrl: string = 'https://cdn.80000hours.org/wp-content/uploads/2012/11/AAEAAQAAAAAAAAUbAAAAJDZiMjcxZmViLTNkMzItNDhlNi1hZDg4LWM5NzI3MzA4NjMxYg.jpg';

constructor(
private organizationService: OrganizationsService,
private route: ActivatedRoute,
private usersService: UsersService,
private navCtrl: NavController,
private formBuilder: FormBuilder,
public alertCtrl: AlertController) {
}

this.loadOrganization();
}

loadOrganization() {
this.organizationService.getByOrganizationId(this.user).subscribe(value => {
this.organization = value;
}, error1 => {
console.log('Cannot get organization from database', error1);
});
}

saveOrganization() {
console.log(this.onSaveForm.value);
this.organizationService.update(this.organization.id, this.onSaveForm.value).subscribe(value => {
console.log('Organization was updated successfully');
console.log(value);

}, error1 => {
console.log('Organization was not updated', error1);
});
}

onChangePic() {
console.log();
this.changePic();
}

async changePic() {
const alert = await this.alertCtrl.create({
header: 'Please enter the url of your image',
buttons: [
{
text: 'Cancel',
role: 'cancel',
cssClass: 'secondary',
handler: () => {
}
}, {
text: 'Confirm',
handler: data => {
console.log('Confirm');
this.organization.imageUrl = data.URL;
}
}
],
inputs: [
{
name: 'URL',
type: 'text',
placeholder: ''
}
]
});

await alert.present();
}

onSearchChange(searchValue: string) {
this.updateIMG(searchValue);
}

updateIMG(searchValue: string) {
this.organization.imageUrl = searchValue;//Strings.Default_Image_Url;//
}

updateUrl(event) {
this.organization.imageUrl = this.defaulUrl;
}

onChangePass() {
this.navCtrl.navigateForward('/change-password/reset').catch(reason => console.log(reason));
}


onDelete() {
console.log();
this.delete();
}

async delete() {
const alert = await this.alertCtrl.create({
header: this.orgSettingsDeleteAalert,
message: this.orgSettingsDeleteConfirm,
buttons: [
{
text: this.orgSettingsDeleteButton,
role : 'delete',
cssClass: '',
handler: data => {
{
console.log('Confirm');
this.usersService.delete(this.organization.id);
this.conf();
}
}
}, {
text: this.orgSettingsDeleteCancel,
role: 'cancel',
cssClass: 'secondary',
handler: () => {
}
},
],

});

await alert.present();
}


Confirm() {
console.log();
this.conf();
}

async conf() {
const alert = await this.alertCtrl.create({
header: this.orgSettingsDeleted,
buttons: [
{
text: this.orgSettingsAlertConfirm,
role : 'Ok',
cssClass: 'btn',
handler: data => {
{
console.log('Confirm');
this.navCtrl.navigateRoot('main').catch(reason => console.log(reason));

}
}
ngOnInit() {
this.onSaveForm = this.formBuilder.group({
'imageUrl': [null, Validators.nullValidator],
'title': [null, Validators.nullValidator],
'address': [null, Validators.nullValidator],
'phone': [null, Validators.nullValidator],
'website': [null, Validators.nullValidator],
'description': [null, Validators.nullValidator],
'userId': this.usersService.getTokenId()
});
this.user = this.usersService.getTokenId();
if (this.user === null) {
this.navCtrl.navigateRoot('main').catch(e => console.log(e));
}
],

});
this.loadOrganization();
}

loadOrganization() {
this.organizationService.getByOrganizationId(this.user).subscribe(value => {
this.organization = value;
}, error1 => {
console.log('Cannot get organization from database', error1);
});
}

saveOrganization() {
console.log(this.onSaveForm.value);
this.organizationService.update(this.organization.id, this.onSaveForm.value).subscribe(value => {
console.log('Organization was updated successfully');

}, error1 => {
console.log('Organization was not updated', error1);
});
}

onSearchChange(searchValue: string) {
this.updateIMG(searchValue);
}

await alert.present();
}
updateIMG(searchValue: string) {
this.organization.imageUrl = searchValue;
}

updateUrl(event) {
this.organization.imageUrl = this.defaulUrl;
}

onChangePass() {
this.navCtrl.navigateForward('/change-password/reset').catch(reason => console.log(reason));
}

onDelete() {
this.delete();
}

async delete() {
const alert = await this.alertCtrl.create({
header: this.orgSettingsDeleteAalert,
message: this.orgSettingsDeleteConfirm,
buttons: [
{
text: this.orgSettingsDeleteButton,
role: 'delete',
cssClass: '',
handler: data => {
{
this.deleteUser();
this.conf();
}
}
}, {
text: this.orgSettingsDeleteCancel,
role: 'cancel',
cssClass: 'secondary',
handler: () => {
}
},
],

});

await alert.present();
}
async conf() {
const alert = await this.alertCtrl.create({
header: this.orgSettingsDeleted,
buttons: [
{
text: this.orgSettingsAlertConfirm,
role: 'Ok',
cssClass: 'btn',
handler: data => {
{
this.navCtrl.navigateRoot('main').catch(reason => console.log(reason));
}
}
}
],

});

await alert.present();
}

deleteUser() {
this.usersService.delete(this.user).subscribe(value => {
},
error1 => {
console.log(error1);
});
}
}


Expand Down
Loading

0 comments on commit ac061d1

Please sign in to comment.