myrle-krantz closed pull request #13: Fix breaking build
URL: https://github.com/apache/fineract-cn-fims-web-app/pull/13
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 2c26401..14abcf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -279,9 +279,9 @@
"integrity": "sha1-iCtGq6+i4ObYh8txobLC+j5tDcY="
},
"@ngrx/effects": {
- "version": "2.0.3",
- "resolved":
"https://registry.npmjs.org/@ngrx/effects/-/effects-2.0.3.tgz";,
- "integrity": "sha1-5UzjQIBt2RqBgmeW8T4kRq7q+3c="
+ "version": "2.0.5",
+ "resolved":
"https://registry.npmjs.org/@ngrx/effects/-/effects-2.0.5.tgz";,
+ "integrity": "sha1-EJhpI7cZOvmwiUToDFpmG6k6eTY="
},
"@ngrx/store": {
"version": "2.2.2",
@@ -8142,6 +8142,12 @@
}
}
},
+ "options": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz";,
+ "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
+ "dev": true
+ },
"original": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/original/-/original-1.0.1.tgz";,
@@ -10045,11 +10051,11 @@
}
},
"rxjs": {
- "version": "5.4.1",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.1.tgz";,
- "integrity": "sha1-ti91fyeURdJloYpY+wpw3JDpFiY=",
+ "version": "5.6.0-forward-compat.5",
+ "resolved":
"https://registry.npmjs.org/rxjs/-/rxjs-5.6.0-forward-compat.5.tgz";,
+ "integrity":
"sha512-CJ9UIV5LlcyGhKWOVvZa4PcVbJJbGNcTunG29cflNo+Y2jAZgvMdZVl4xwYNiYK5gmley/0QuAFVJ0M4GO+GNQ==",
"requires": {
- "symbol-observable": "^1.0.1"
+ "symbol-observable": "1.0.1"
}
},
"safe-buffer": {
@@ -11171,9 +11177,9 @@
}
},
"symbol-observable": {
- "version": "1.2.0",
- "resolved":
"https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz";,
- "integrity":
"sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
+ "version": "1.0.1",
+ "resolved":
"https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz";,
+ "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
},
"tapable": {
"version": "0.2.8",
@@ -11662,6 +11668,12 @@
}
}
},
+ "ultron": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";,
+ "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
+ "dev": true
+ },
"underscore": {
"version": "1.7.0",
"resolved":
"https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";,
@@ -12648,8 +12660,13 @@
},
"ws": {
"version": "1.1.1",
- "resolved": "",
- "dev": true
+ "resolved": "http://registry.npmjs.org/ws/-/ws-1.1.1.tgz";,
+ "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=",
+ "dev": true,
+ "requires": {
+ "options": ">=0.0.5",
+ "ultron": "1.0.x"
+ }
},
"xhr2": {
"version": "0.1.4",
diff --git
a/src/app/groups/detail/signOffMeeting/signOff-meeting.component.html
b/src/app/groups/detail/signOffMeeting/signOff-meeting.component.html
index ac72d86..b71fb9e 100644
--- a/src/app/groups/detail/signOffMeeting/signOff-meeting.component.html
+++ b/src/app/groups/detail/signOffMeeting/signOff-meeting.component.html
@@ -50,9 +50,6 @@ <h3> Attendance </h3>
</mat-option>
</mat-select>
</mat-form-field>
- <!-- <mat-form-field>
- <input matInput type="text" value="{{member}}"
controlName="member" >
- </mat-form-field> -->
</div>
</td>
</tr>
@@ -70,4 +67,4 @@ <h3> Attendance </h3>
</td-step>
</td-steps>
</div>
-</fims-layout-card-over>
\ No newline at end of file
+</fims-layout-card-over>
diff --git a/src/app/groups/detail/signOffMeeting/signOff-meeting.component.ts
b/src/app/groups/detail/signOffMeeting/signOff-meeting.component.ts
index 10954f4..842c0ba 100644
--- a/src/app/groups/detail/signOffMeeting/signOff-meeting.component.ts
+++ b/src/app/groups/detail/signOffMeeting/signOff-meeting.component.ts
@@ -16,118 +16,85 @@
* specific language governing permissions and limitations
* under the License.
*/
-import {Component, Input,Output,OnInit,EventEmitter,ViewChild} from
'@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
-import {FormComponent} from '../../../common/forms/form.component';
-import {FormBuilder, Validators,FormGroup} from '@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {FimsValidators} from '../../../common/validator/validators';
-import { Attendee} from '../../../services/group/domain/attendee.model';
+import {Attendee} from '../../../services/group/domain/attendee.model';
import {Customer} from '../../../services/customer/domain/customer.model';
import {Observable} from 'rxjs/Observable';
import * as fromGroups from '../../store';
import {Subscription} from 'rxjs/Subscription';
-import { TdStepComponent } from '@covalent/core';
-import {Store} from '@ngrx/store';
-import * as fromRoot from '../../../store';
+import {TdStepComponent} from '@covalent/core';
import {StatusOptionList} from './domain/status-option-list.model';
-import {FetchRequest} from
'../../../services/domain/paging/fetch-request.model';
-import {SEARCH} from '../../../store/customer/customer.actions';
-import {Meeting} from '../../../services/group/domain/meeting.model'
import {SignOffMeeting} from
'../../../services/group/domain/signoff-meeting.model'
import {UPDATE} from '../../store/meeting/meeting.actions';
import {Group} from '../../../services/group/domain/group.model';
import {GroupsStore} from '../../store/index';
-
@Component({
- templateUrl:'./signOff-meeting.component.html'
+ templateUrl: './signOff-meeting.component.html'
})
+export class SignOffMeetingComponent implements OnInit {
-export class SignOffMeetingComponent implements OnInit{
-
-form:FormGroup
-customers: Observable<Customer[]>;
-customers1: Customer[];
-name:Subscription;
-groupSubscription: Subscription;
-group: Group;
-members: any[];
-
-
-attendee : Attendee[] =[];
-len :number;
-i:any;
+ form: FormGroup;
+ customers: Observable<Customer[]>;
+ name: Subscription;
+ groupSubscription: Subscription;
+ group: Group;
+ members: any[];
+ statusOptions = StatusOptionList;
+ @ViewChild('detailsStep') step: TdStepComponent;
-statusOptions = StatusOptionList;
+ @ViewChild('detailsStep') detailsStep: TdStepComponent;
-@ViewChild('detailsStep') step: TdStepComponent;
+ constructor(private router: Router, private route: ActivatedRoute, private
formBuilder: FormBuilder, private store: GroupsStore) {}
-@ViewChild('detailsStep') detailsStep: TdStepComponent;
-
-constructor(private router: Router,private route: ActivatedRoute,private
formBuilder: FormBuilder,
- private store: Store<fromRoot.State>, private store1: GroupsStore) {
- // this.customers = customerService.getCustomer("identifier").share();
-
- }
-
-ngOnInit(){
- this.form= this.formBuilder.group({
- sequence: ['', [Validators.required, FimsValidators.minValue(0)]],
- cycle : ['', [Validators.required, FimsValidators.minValue(0)]],
- duration:['',[Validators.required, FimsValidators.minValue(0)]],
- status: ['', [Validators.required]],
- member:['']
+ ngOnInit() {
+ this.form = this.formBuilder.group({
+ sequence: ['', [Validators.required, FimsValidators.minValue(0)]],
+ cycle: ['', [Validators.required, FimsValidators.minValue(0)]],
+ duration: ['', [Validators.required, FimsValidators.minValue(0)]],
+ status: ['', [Validators.required]],
+ member: ['']
+ });
- })
+ this.groupSubscription = this.store.select(fromGroups.getSelectedGroup)
+ .subscribe(group => this.group = group);
- this.groupSubscription = this.store1.select(fromGroups.getSelectedGroup)
- .subscribe(group => this.group = group);
-
this.detailsStep.open();
- console.log(this.group.members)
- this.members= this.group.members;
- this.len = this.members.length
-
-
+ this.members = this.group.members;
}
-
-
-
- save(){
-
- for ( this.i in this.members){
- let attend : Attendee = {
- customerIdentifier:this.members[this.i],
- status : this.form.get('status').value,
- }
- console.log(attend);
- this.attendee.push(attend);
-}
- console.log("attendde",this.attendee)
-
-
- const signoff : SignOffMeeting = {
- sequence:this.form.get('sequence').value,
- cycle: this.form.get('cycle').value,
- duration:this.form.get('duration').value,
- attendees:this.attendee
- };
-
- this.store1.dispatch({ type: UPDATE, payload: {
+ save() {
+ const attendees: Attendee[] = this.members.map(customerIdentifier => ({
+ customerIdentifier,
+ status: this.form.get('status').value,
+ }));
+
+ const signoff: SignOffMeeting = {
+ sequence: this.form.get('sequence').value,
+ cycle: this.form.get('cycle').value,
+ duration: this.form.get('duration').value,
+ attendees
+ };
+
+ this.store.dispatch({
+ type: UPDATE, payload: {
groupId: this.group.identifier,
signoff,
- activatedRoute: this.route
- } });
- }
+ activatedRoute: this.route
+ }
+ });
+ }
+
+ cancel() {
+ this.navigateAway();
+ }
+
+ navigateAway(): void {
+ this.router.navigate(['../'], {relativeTo: this.route});
+ }
- cancel() {
- this.navigateAway();
- }
-
- navigateAway(): void {
- this.router.navigate(['../'], { relativeTo: this.route });
- }
-
}
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
