Merge branch 'appointments-dev' into 'master' (ed8a3d69) · Commits · SMASCH / scheduling-system

Commit ed8a3d69 authored 8 years ago by Piotr Gawron

Merge branch 'appointments-dev' into 'master'

Appointments dev

See merge request !5

parents 0ced5b34 0983f6b8

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

appointment-import/src/main/java/smash/appointment/parse/AppointmentDao.java 11 additions, 5 deletions

...src/main/java/smash/appointment/parse/AppointmentDao.java
appointment-import/src/main/java/smash/appointment/parse/AppointmentType.java 5 additions, 1 deletion

...rc/main/java/smash/appointment/parse/AppointmentType.java
appointment-import/src/main/java/smash/appointment/parse/AppointmentTypeCollection.java 7 additions, 3 deletions

...va/smash/appointment/parse/AppointmentTypeCollection.java
appointment-import/src/main/java/smash/appointment/parse/LihControlParser.java 6 additions, 0 deletions

...c/main/java/smash/appointment/parse/LihControlParser.java
appointment-import/src/main/java/smash/appointment/parse/Main.java 3 additions, 7 deletions

...nt-import/src/main/java/smash/appointment/parse/Main.java
appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java 19 additions, 18 deletions

...rc/main/java/smash/appointment/parse/PrcFlyingParser.java
appointment-import/src/main/java/smash/appointment/parse/RedcapParser.java 1 addition, 1 deletion

...t/src/main/java/smash/appointment/parse/RedcapParser.java
appointment-import/src/main/java/smash/appointment/parse/SubjectSqlExporter.java 6 additions, 0 deletions

...main/java/smash/appointment/parse/SubjectSqlExporter.java
appointment-import/src/main/java/smash/appointment/parse/Visit.java 22 additions, 5 deletions

...t-import/src/main/java/smash/appointment/parse/Visit.java
appointment-import/src/main/java/smash/appointment/parse/VisitSqlExporter.java 2 additions, 5 deletions

...c/main/java/smash/appointment/parse/VisitSqlExporter.java
appointment-import/src/main/java/smash/appointment/parse/XlsxCalendarProcessor.java 1 addition, 1 deletion

...n/java/smash/appointment/parse/XlsxCalendarProcessor.java
appointment-import/src/test/java/smash/appointment/parse/AppointmentDaoTest.java 3 additions, 3 deletions

...test/java/smash/appointment/parse/AppointmentDaoTest.java
appointment-import/src/test/java/smash/appointment/parse/CellParserTest.java 16 additions, 6 deletions

...src/test/java/smash/appointment/parse/CellParserTest.java
appointment-import/src/test/java/smash/appointment/parse/PrcFlyingParserTest.java 1 addition, 0 deletions

...est/java/smash/appointment/parse/PrcFlyingParserTest.java
appointment-import/src/test/java/smash/appointment/parse/RedcapParserTest.java 1 addition, 1 deletion

...c/test/java/smash/appointment/parse/RedcapParserTest.java
appointment-import/testFiles/prcFlyingTeam.xlsx 0 additions, 0 deletions

appointment-import/testFiles/prcFlyingTeam.xlsx
smash/web/forms.py 3 additions, 20 deletions

smash/web/forms.py
smash/web/models.py 104 additions, 64 deletions

smash/web/models.py
smash/web/templates/_base.html 1 addition, 1 deletion

smash/web/templates/_base.html
smash/web/templates/appointments/edit.html 33 additions, 1 deletion

smash/web/templates/appointments/edit.html

with 245 additions and 142 deletions

Please register or to comment