Merge remote-tracking branch 'origin/development' master del4
authorDominik <muggd1@bfh.ch>
Sun, 10 Jan 2016 13:53:17 +0000 (14:53 +0100)
committerDominik <muggd1@bfh.ch>
Sun, 10 Jan 2016 13:53:17 +0000 (14:53 +0100)
Conflicts:
.gitignore
pom.xml
src/site/apt/sprint_backlog.apt

1  2 
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.jdt.core.prefs
pom.xml
src/site/apt/sprint_backlog.apt

index 0000000,0000000..4c28b1a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++eclipse.preferences.version=1\r
++encoding//src/main/java=UTF-8\r
++encoding//src/test/java=UTF-8\r
++encoding/<project>=UTF-8\r
index 0000000,0000000..d59e09c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,5 @@@
++eclipse.preferences.version=1\r
++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
++org.eclipse.jdt.core.compiler.compliance=1.8\r
++org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning\r
++org.eclipse.jdt.core.compiler.source=1.8\r
diff --combined pom.xml
+++ b/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>\r
        <groupId>srs-purple</groupId>\r
        <artifactId>srs-purple-main</artifactId>\r
-       <version>1.1</version>\r
 -      <version>1.3-SNAPSHOT</version>\r
++      <version>1.4</version>\r
        <name>Smart Reservation System</name>\r
        <description>Some description ...</description>\r
        <organization>\r
@@@ -16,7 -16,7 +16,7 @@@ Sprint Backlo
  |                     |                                                       |                                                       |                               |Effort |Effort |Effort |                       |
  |                     |                                                       |                                                       |                               |[h]    |[h]    |[h]    |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
 -| 1                   | -     Login                                   | Erlaubt es einem User         |High                   |10             |               |               |Done           |
 +| 1                   | -     Login                                   | Erlaubt es einem User         |High                   |10             |               |               |in progress|
  |                     |                                                       | sich einzuloggen                      |                               |               |               |               |                       |
  |                     |                                                       |                                                       |                               |               |               |               |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
@@@ -24,7 -24,7 +24,7 @@@
  |                     |                                                       | Computer, smartphones und     |                               |               |               |               |                       |
  |                     |                                                       | Tablets                                       |                               |               |               |               |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
 -| 3                   | -     Ressourcen Reservieren  | Erlaubt es einem User         |High                   |10             |               |               |Done           |
 +| 3                   | -     Ressourcen Reservieren  | Erlaubt es einem User         |High                   |13             |               |               |Done           |
  |                     |                                                       | eine neue Reservation         |                               |               |               |               |                       |
  |                     |                                                       | zu tätigen                           |                               |               |               |               |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
  |                     |       wiederholungen                  | z.B wöchentliche             |                               |               |               |               |                       |
  |                     |                                                       | reservationen zu machen       |                               |               |               |               |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
- | 7                   | -     resource manager client | ein client über den der      |low                    |               |               |               |Waiting        |
+ | 7                   | -     resource manager client | ein client über den der      |High                   |21             |               |               |done           |
  |                     |                                                       | resource manager seine        |                               |               |               |               |                       |
  |                     |                                                       | Aktionen durchführen kann    |                               |               |               |               |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
- | 8                   | -     Resourcen Prüfen               | erlaubt es dem resource       |low                    |               |               |               |Waiting        |
+ | 8                   | -     Resourcen Prüfen               | erlaubt es dem resource       |High                   |               |               |               |Waiting        |
  |                     |                                                       | manager zu sehen wer zu       |                               |               |               |               |                       |
  |                     |                                                       | welcher Zeit welche           |                               |               |               |               |                       |
  |                     |                                                       | ressource gebucht hat         |                               |               |               |               |                       |
  |                     |                                                       |                                                       |                               |[h]    |[h]    |[h]    |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
  
 -
 -
  * 3. finished tasks
  
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
  | 6.2         |                                                       | Test für 5.1                         |High                   |1              |               |2              |Done           |
  |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7                   | -     resource manager                | ein client über den der      |High                   |21             |               |26             |Done           |       
+ |                     |                                                       | resource manager seine        |                               |               |               |               |                       |
+ |                     |                                                       | Aktionen durchführen kann    |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.1         |                                                       | SessionController Klasse      |High                   | 2             |               |3              |Done           |       
+ |                     |                                                       | implementieren                        |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.2         |                                                       | Testklasse für                       |High                   | 2             |               |2              |Done           |       
+ |                     |                                                       | SessionController                     |                               |               |               |               |                       |
+ |                     |                                                       | implementieren                        |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.3         |                                                       | UserController anpassen       |High                   | 2             |               |5              |Done           |       
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.4         |                                                       | Testklasse für                       |High                   | 2             |               |3              |Done           |       
+ |                     |                                                       | UserController anpassen       |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.5         |                                                       | Die Controller Klasse         |High                   | 2             |               |2              |Done           |       
+ |                     |                                                       | ResourceManagerController     |                               |               |               |               |                       |
+ |                     |                                                       | implementieren                        |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.6         |                                                       | Testklasse für                       |High                   | 3             |               |3              |Done           |       
+ |                     |                                                       | ResourceManagerController     |                               |               |               |               |                       |
+ |                     |                                                       | implementieren                        |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.7         |                                                       | Abstrakte Klasse                      |High                   | 2             |               |2              |Done           |       
+ |                     |                                                       | Controller                            |                               |               |               |               |                       |
+ |                     |                                                       | implementieren                        |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.8         |                                                       | in User klasse Collection     |High                   | 1             |               |1              |Done           |       
+ |                     |                                                       | mit Rollen hinzufügen                |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.9         |                                                       | Testklasse für User          |High                   | 1             |               |1              |Done           |       
+ |                     |                                                       | anpassen                                      |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.10                |                                                       | Klasse Role implementieren|High                       | 1             |               |1              |Done           |       
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+
+ | 7.11                |                                                       | Klassenstruktur anpassen      |High                   | 3             |               |3              |Done           |       
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
+ |                     |                                                       |                                                       |                               |               |               |               |                       |
  *-----------+---------------------------+---------------------------+---------------+-------+-------+-------+-----------+