You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by GitBox <gi...@apache.org> on 2018/09/26 07:27:09 UTC
[GitHub] awasum closed pull request #6: Bug fixes
awasum closed pull request #6: Bug fixes
URL: https://github.com/apache/fineract-cn-group-finance/pull/6
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/package-lock.json b/package-lock.json
index 7a0d690..a4d95fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3958,12 +3958,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3978,17 +3980,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -4105,7 +4110,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -4117,6 +4123,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -4131,6 +4138,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -4138,12 +4146,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -4162,6 +4172,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -4242,7 +4253,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -4254,6 +4266,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -4375,6 +4388,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
diff --git a/src/app/centers/form/form.component.ts b/src/app/centers/form/form.component.ts
index 6f1e6cc..a76396c 100644
--- a/src/app/centers/form/form.component.ts
+++ b/src/app/centers/form/form.component.ts
@@ -31,6 +31,7 @@ import {Store} from '@ngrx/store';
import * as fromRoot from '../../store';
import {SEARCH as SEARCH_OFFICE} from '../../store/office/office.actions';
import {SEARCH as SEARCH_ROLE} from '../../store/role/role.actions';
+import { Staff } from '../../services/domain/centers/staff';
export interface CenterFormData {
user: User;
@@ -67,6 +68,7 @@ export class CenterFormComponent implements OnInit {
roles: Observable<Role[]>;
+ staffs: Staff[];
detailForm: FormGroup;
contactForm: FormGroup;
officeForm: FormGroup;
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index 8aea8b0..4a1d754 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -66,18 +66,20 @@
<br>
<br>
<div class="app-input">
- <mat-icon>https</mat-icon>
- </div>
+ <mat-icon>https
<div class="app-input1">
<mat-form-field class="app-input2">
<input matInput placeholder="Password" type="password" formControlName="password" autocomplete="new-password" [type]="hide ? 'password' : 'text'">
+ <input matInput placeholder="Password" type="password" formControlName="password" autocomplete="new-password" [type]="passwordField ? 'password' : 'text'">
<mat-error *ngIf="form.get('password').hasError('required')">
Required
</mat-error>
- <mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility' : 'visibility_off'}}</mat-icon>
+ <mat-icon matSuffix (click)="togglePasswordField()">{{passwordField ? 'visibility' : 'visibility_off'}}</mat-icon>
+ <mat-icon matSuffix (click)="togglePasswordField()">{{passwordField ? 'visibility_off' : 'visibility'}}</mat-icon>
</mat-form-field>
</div>
<br>
+ <p style="color:red;text-align: center">{{ error$ | async }}</p>
<br>
<p>
<button mat-raised-button color="primary" type="submit" class="btn" [disabled]="form.invalid">Sign In</button>
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 69e5038..2126061 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -45,6 +45,7 @@ export class LoginComponent implements OnInit, OnDestroy {
];
form: FormGroup;
+ passwordField: boolean = true
error$: Observable<string>;
@@ -99,6 +100,13 @@ export class LoginComponent implements OnInit, OnDestroy {
}
});
}
+
+ togglePasswordField() {
+ if (this.passwordField)
+ this.passwordField = false
+ else
+ this.passwordField = true
+ }
selectLanguage(selectChange: MatSelectChange): void {
sessionStorage.setItem(TRANSLATE_STORAGE_KEY, selectChange.value);
diff --git a/src/app/services/domain/centers/staff.ts b/src/app/services/domain/centers/staff.ts
new file mode 100644
index 0000000..22419e7
--- /dev/null
+++ b/src/app/services/domain/centers/staff.ts
@@ -0,0 +1,3 @@
+export interface Staff {
+
+}
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services