diff --git a/assets/document/~$I_LOG_memoire_diplome_Vanini_2019docx.docx b/assets/document/~$I_LOG_memoire_diplome_Vanini_2019docx.docx deleted file mode 100644 index 950cb929df74a59bba452f14c7d4bfe8490c6240..0000000000000000000000000000000000000000 Binary files a/assets/document/~$I_LOG_memoire_diplome_Vanini_2019docx.docx and /dev/null differ diff --git a/compilation/.idea/workspace.xml b/compilation/.idea/workspace.xml index 5424105edbdf8fb8e785a198d97f21cd30582df9..68e3570bef87125473c7bfc1ba59f01a42dea19a 100644 --- a/compilation/.idea/workspace.xml +++ b/compilation/.idea/workspace.xml @@ -2,7 +2,11 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/../assets/document/~$I_LOG_memoire_diplome_Vanini_2019docx.docx" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/../gateway/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../gateway/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../gateway/src/main/java/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/../gateway/src/main/java/App.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../gateway/target/classes/ch/hepia/repository/ProgramInterface.class" beforeDir="false" afterPath="$PROJECT_DIR$/../gateway/target/classes/ch/hepia/repository/ProgramInterface.class" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../gateway/target/classes/ch/hepia/repository/Programs.class" beforeDir="false" afterPath="$PROJECT_DIR$/../gateway/target/classes/ch/hepia/repository/Programs.class" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -290,12 +294,12 @@ <workItem from="1561625991543" duration="652000" /> <workItem from="1561709776845" duration="796000" /> <workItem from="1562247435317" duration="222000" /> - <workItem from="1562589894307" duration="563000" /> + <workItem from="1562589894307" duration="725000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="84464000" /> + <option name="totallyTimeSpent" value="84626000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -308,9 +312,8 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="0" width="1440" height="900" extended-state="0" /> - <editor active="true" /> <layout> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31616595" /> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31616595" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> diff --git a/gateway/.idea/workspace.xml b/gateway/.idea/workspace.xml index d6ab101c765a73a40ffb591c3c1d3c15255b852d..99c68d255ec08f73cfe10106a048dea4b7a4431a 100644 --- a/gateway/.idea/workspace.xml +++ b/gateway/.idea/workspace.xml @@ -2,7 +2,13 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/../assets/document/~$I_LOG_memoire_diplome_Vanini_2019docx.docx" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/../compilation/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../compilation/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/App.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/target/classes/app.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/app.class" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/target/classes/ch/hepia/repository/ProgramInterface.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ch/hepia/repository/ProgramInterface.class" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/target/classes/ch/hepia/repository/Programs.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/ch/hepia/repository/Programs.class" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -35,7 +41,7 @@ <entry file="file://$PROJECT_DIR$/src/main/java/ch/hepia/repository/Programs.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="174"> - <caret line="286" lean-forward="true" selection-start-line="286" selection-end-line="286" /> + <caret line="286" selection-start-line="286" selection-end-line="286" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -46,8 +52,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/App.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="413"> - <caret line="258" column="26" lean-forward="true" selection-start-line="258" selection-start-column="26" selection-end-line="258" selection-end-column="26" /> + <state relative-caret-position="233"> + <caret line="263" column="28" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="28" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -447,12 +453,12 @@ <workItem from="1562169327924" duration="100000" /> <workItem from="1562224513275" duration="227000" /> <workItem from="1562241655591" duration="2189000" /> - <workItem from="1562589893170" duration="596000" /> + <workItem from="1562589893170" duration="760000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="330289000" /> + <option name="totallyTimeSpent" value="330453000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -467,7 +473,7 @@ <frame x="0" y="0" width="1440" height="900" extended-state="0" /> <editor active="true" /> <layout> - <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49924126" visible="true" weight="0.20100144" /> + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49924126" visible="true" weight="0.20100144" /> <window_info id="Structure" order="1" sideWeight="0.5007587" side_tool="true" weight="0.20127796" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> @@ -476,7 +482,7 @@ <window_info id="Favorites" order="6" side_tool="true" /> <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32920355" /> - <window_info anchor="bottom" id="Run" order="2" weight="0.33628318" /> + <window_info anchor="bottom" id="Run" order="2" weight="0.33614457" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.39638555" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> @@ -486,7 +492,7 @@ <window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Terminal" order="10" weight="0.32771084" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> - <window_info anchor="bottom" id="Messages" order="12" weight="0.31858408" /> + <window_info anchor="bottom" id="Messages" order="12" weight="0.3180723" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> @@ -882,7 +888,7 @@ <entry file="file://$PROJECT_DIR$/src/main/java/ch/hepia/repository/Programs.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="174"> - <caret line="286" lean-forward="true" selection-start-line="286" selection-end-line="286" /> + <caret line="286" selection-start-line="286" selection-end-line="286" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -891,8 +897,8 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/App.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="413"> - <caret line="258" column="26" lean-forward="true" selection-start-line="258" selection-start-column="26" selection-end-line="258" selection-end-column="26" /> + <state relative-caret-position="233"> + <caret line="263" column="28" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="28" /> <folding> <element signature="imports" expanded="true" /> </folding> diff --git a/gateway/src/main/java/App.java b/gateway/src/main/java/App.java index ebcc250b9fe86000e4614ef5b1322a9ec5988cb5..41171fbf44d5aa6b11fe259b792af27ffefac2b4 100755 --- a/gateway/src/main/java/App.java +++ b/gateway/src/main/java/App.java @@ -255,9 +255,9 @@ public class App { }, roles(Roles.SHODAI, Roles.SENSEI, Roles.MONJI)); app.put("program/:programid/kata/:kataid/toggleactivation", ctx -> { - dbPrograms.toggleKataActivation(ctx.pathParam("kataid"), ctx.pathParam("programid"); + dbPrograms.toggleKataActivation(ctx.pathParam("kataid"), ctx.pathParam("programid")); ctx.json(200); - }), roles(Roles.SHODAI, Roles.SENSEI); + }, roles(Roles.SHODAI, Roles.SENSEI)); app.put("program/:programid/kata/:kataid/toggleisclosed", ctx -> { dbPrograms.toggleIsClosed(ctx.pathParam("kataid"), ctx.pathParam("programid")); diff --git a/gateway/target/classes/app.class b/gateway/target/classes/app.class index 3fe0baf0413782e59fbbf048c31254ffe842a60e..f385a00baf90fc6646b7cd7e57fa405114e27954 100644 Binary files a/gateway/target/classes/app.class and b/gateway/target/classes/app.class differ diff --git a/gateway/target/classes/ch/hepia/repository/ProgramInterface.class b/gateway/target/classes/ch/hepia/repository/ProgramInterface.class index a45bc5ba827a11506c2eeabcecb30c2d120919f4..10106095ac55b941e67bad05bf03822c7328e16d 100644 Binary files a/gateway/target/classes/ch/hepia/repository/ProgramInterface.class and b/gateway/target/classes/ch/hepia/repository/ProgramInterface.class differ diff --git a/gateway/target/classes/ch/hepia/repository/Programs.class b/gateway/target/classes/ch/hepia/repository/Programs.class index 06676625d97dcd4ce85589c5c3d629f5a8a96b73..7da358aab117a998a22eb1bc83bab08f6abf52b0 100644 Binary files a/gateway/target/classes/ch/hepia/repository/Programs.class and b/gateway/target/classes/ch/hepia/repository/Programs.class differ