Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding schools and show/edit details - basic functionality #204

Merged
merged 20 commits into from
Jan 5, 2019

Conversation

sleidig
Copy link
Member

@sleidig sleidig commented Dec 14, 2018

see issue #42
This PR is covering part of the changes of PR #156 in order to make the finished, more basic changes available to users sooner.

Visible/Frontend Changes

  • SchoolDetails page contains more fields for detailed information
  • SchoolDetails page allows editing of school information
  • new school can be added
  • SchoolsList shows columns of school details

Architectural/Backend Changes

  • School entity has more attributes for various details

codingfabi and others added 14 commits June 10, 2018 20:14
# Conflicts:
#	src/app/app.routing.ts
# Conflicts:
#	npm-shrinkwrap.json
#	src/app/app.routing.ts
#	src/app/children/children-list/children-list.component.ts
#	src/app/schools/school-detail/school-detail.component.html
#	src/app/schools/school-detail/school-detail.component.ts
#	src/app/schools/schools-list/schools-list.component.css
#	src/app/schools/schools-list/schools-list.component.html
#	src/app/schools/schools-list/schools-list.component.ts
#	src/app/schools/schoolsShared/school.ts
#	src/app/schools/schoolsShared/schools.services.ts
# Conflicts:
#	src/app/schools/school-detail/school-detail.component.html
…tching students that are visiting this school.
…el where each student saves the school it attends
…etails-basic

# Conflicts:
#	src/app/schools/school-detail/school-detail.component.html
#	src/app/schools/schools-list/schools-list.component.html
@sleidig sleidig added this to the [v2.5] milestone Dec 14, 2018
@sleidig sleidig force-pushed the school-details-basic branch from 0edf159 to e5efeab Compare December 14, 2018 08:35
@sleidig sleidig changed the title [WIP] Adding schools and show/edit details - basic functionality Adding schools and show/edit details - basic functionality Dec 14, 2018
Copy link
Contributor

@codingfabi codingfabi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine and can be merged. But we should realy start implementing the proper Child School Relation.
But so far, for making the feature available in a accaptable time, this pr is good.

@sleidig
Copy link
Member Author

sleidig commented Dec 18, 2018

Thanks for the review. I'll fix the CI build fail and merge it in the next days

}

getSchools(): Observable<School[]> {
return Observable.fromPromise(this.entityMapper.loadType<School>(School));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are currently updating to Angular 7, where this is no longer allowed. We should instead use

import {from} from 'rxjs';
//...
return from(this.entityMapper.loadType<School>(School));

We changed this everywhere else in our branch already

@TheSlimvReal
Copy link
Collaborator

For the implementation of the ChildSchoolRelation please check out the branch child_school_relation_impl.
There I shared my progress of how far I got with the implementation. The branch is based on the SchoolDetailsFeature

changed new rxjs syntax from Observable.of()
@codeclimate
Copy link

codeclimate bot commented Jan 5, 2019

Code Climate has analyzed commit 8a580d3 and detected 10 issues on this pull request.

Here's the issue category breakdown:

Category Count
Duplication 10

The test coverage on the diff in this pull request is 48.9% (80% is the threshold).

This pull request will bring the total coverage in the repository to 76.6% (-0.8% change).

View more on Code Climate.

@sleidig sleidig merged commit c2aa217 into master Jan 5, 2019
@sleidig sleidig deleted the school-details-basic branch January 5, 2019 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants