Author: qmoriceau Date: 2013-06-12 11:25:58 +0200 (Wed, 12 Jun 2013) New Revision: 42 Url: http://chorem.org/projects/incubator/repository/revisions/42 Log: Modification de l'interface, elle est en une seul fen?\195?\170tre dor?\195?\169navant. Added: jtimerhtml5/src/main/resources/html/js/index.js jtimerhtml5/target/ jtimerhtml5/target/antrun/ jtimerhtml5/target/antrun/build-main.xml jtimerhtml5/target/generated-sources/ jtimerhtml5/target/generated-sources/annotations/ jtimerhtml5/target/jtimer-2.0-SNAPSHOT.jar jtimerhtml5/target/lib/ jtimerhtml5/target/lib/commons-beanutils-1.8.3.jar jtimerhtml5/target/lib/commons-collections-3.2.1.jar jtimerhtml5/target/lib/commons-io-2.3.jar jtimerhtml5/target/lib/commons-logging-1.1.1.jar jtimerhtml5/target/lib/commons-primitives-1.0.jar jtimerhtml5/target/lib/gson-2.2.4.jar jtimerhtml5/target/lib/h2-1.3.170.jar jtimerhtml5/target/lib/javafx-2.2.3.jar jtimerhtml5/target/lib/javax.servlet-3.0.0.v201112011016.jar jtimerhtml5/target/lib/jetty-http-9.0.3.v20130506.jar jtimerhtml5/target/lib/jetty-io-9.0.3.v20130506.jar jtimerhtml5/target/lib/jetty-server-9.0.3.v20130506.jar jtimerhtml5/target/lib/jetty-util-9.0.3.v20130506.jar jtimerhtml5/target/lib/nuiton-i18n-2.4.jar jtimerhtml5/target/lib/nuiton-utils-2.2.jar jtimerhtml5/target/maven-archiver/ jtimerhtml5/target/maven-archiver/pom.properties jtimerhtml5/target/surefire-workdir/ jtimerhtml5/target/surefire/ Removed: jtimerhtml5/src/main/resources/html/about.html jtimerhtml5/src/main/resources/html/alerts.html jtimerhtml5/src/main/resources/html/css/about.css jtimerhtml5/src/main/resources/html/css/alerts.css jtimerhtml5/src/main/resources/html/css/editionT.css jtimerhtml5/src/main/resources/html/css/img/ jtimerhtml5/src/main/resources/html/css/report.css jtimerhtml5/src/main/resources/html/css/style.css jtimerhtml5/src/main/resources/html/editionTask.html jtimerhtml5/src/main/resources/html/img/bell.png jtimerhtml5/src/main/resources/html/img/bookmark-new.png jtimerhtml5/src/main/resources/html/img/document-new.png jtimerhtml5/src/main/resources/html/img/go-next.png jtimerhtml5/src/main/resources/html/img/notes.png jtimerhtml5/src/main/resources/html/img/process-stop.png jtimerhtml5/src/main/resources/html/js/alerts.js jtimerhtml5/src/main/resources/html/js/editionT.js jtimerhtml5/src/main/resources/html/js/jtimer.js jtimerhtml5/src/main/resources/html/js/report.js Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java jtimerhtml5/src/main/resources/html/css/index.css jtimerhtml5/src/main/resources/html/index.html Modified: jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java =================================================================== --- jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/java/org/chorem/jtimer/JTimerHandler.java 2013-06-12 09:25:58 UTC (rev 42) @@ -36,21 +36,20 @@ Object result; ExclusionStrategy excludeTasks = new TaskExclusionStrategy(TimerTask.class); Gson gson = new GsonBuilder().setExclusionStrategies(excludeTasks).create(); - - String[] param = new String[path.length-3]; + Gson gson2 = new Gson(); + Object[] param = new String[path.length-3]; for(int i=0;i<path.length-3;i++){ param[i]=path[i+3]; } - /*if(path[1].equals("task")){ // test de transformation json to java - param[0] = gson.fromJson(param[0], TimerTask.class); + if(path[1].equals("task")){ // test de transformation json to java + param[0] = gson2.fromJson((String) param[0], TimerTask.class); } else if(path[1].equals("project")){ - param[0] = gson.fromJson(param[0], TimerProject.class); - }*/ + param[0] = gson2.fromJson((String) param[0], TimerProject.class); + } List<Method> m = ObjectUtil.getMethod(Storage.class,path[2],false); - try { - result = ObjectUtil.call(storage, m.get(0), param); + result = ObjectUtil.call(storage, m.get(0), (String[]) param); content = gson.toJson(result); } catch (IllegalAccessException e) { // TODO Auto-generated catch block Deleted: jtimerhtml5/src/main/resources/html/about.html =================================================================== --- jtimerhtml5/src/main/resources/html/about.html 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/about.html 2013-06-12 09:25:58 UTC (rev 42) @@ -1,32 +0,0 @@ -<!DOCTYPE html> -<html lang="fr"> - <head> - <meta charset="UTF-8"/> - <title>A propos de jTimer</title> - <link rel="stylesheet" href="jtimer.css"/> - <script src="jtimer.js"></script> - <script type="text/javascript"> - <!-- //choix entre les deux texte via les boutons - function action(i){ - if(i == 1){ - $('#dataText').html('<b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2012, Code Lutin.<br><br><a href="http://maven-site.chorem.org/jtimer">http://maven-site.chorem.org/jtimer</a><br><br>Merci de rapporter les bugs de jTimer.'); - $('#bt1').css('background',"#339999"); - $('#bt2').css('background',"#ffffff"); - } - if(i == 2){ - $('#dataText').html("Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec jTimer. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme."); - $('#bt2').css('background',"#339999"); - $('#bt1').css('background',"#ffffff"); - } - } - //--> - </script> - </head> - <body> - <img src="img/jtimer-logo-orange.jpg" alt="logo"/><br> - <span id="bt1" onclick="action(1)">A propos de jTimer</span> - <span id="bt2" onclick="action(2)">Licence</span><br> - <div id="frame"><p id="dataText"><b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2013, Code Lutin.<br><br><a href="http://maven-site.chorem.org/jtimer">http://maven-site.chorem.org/jtimer</a><br><br>Merci de rapporter les bugs de jTimer.</p></div> - <input id="close" type="submit" value="Fermer" OnClick="javascript:window.close()"> - </body> -</html> Deleted: jtimerhtml5/src/main/resources/html/alerts.html =================================================================== --- jtimerhtml5/src/main/resources/html/alerts.html 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/alerts.html 2013-06-12 09:25:58 UTC (rev 42) @@ -1,21 +0,0 @@ -<!DOCTYPE html> -<html lang="fr"> - <head> - <meta charset="UTF-8"/> - <title>jTimer - Alertes</title> - <link rel="stylesheet" href="jtimer.css"/> - <script src="jtimer.js"></script> - </head> - <body> - <b>Listes des alertes :</b> - <span id="head"> - <input type="button" id="alertCancel" value="Annuler" OnClick="javascript:window.close()"> - <input type="button" id="alertSave" value="Sauver"> - </span> - <br> - <br> - <div id="listAlerts">Type & Durée<br><br> - </div> - <input type="button" id="alertAdd" value="Ajouter" onclick="add()"> - </body> -</html> Deleted: jtimerhtml5/src/main/resources/html/css/about.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/about.css 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/css/about.css 2013-06-12 09:25:58 UTC (rev 42) @@ -1,36 +0,0 @@ -#dataText { - margin-left:5px; -} - -#frame { - width:400px; - height:155px; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; -} - -#bt1{ - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; - background-color:#339999; -} - -#bt2{ - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; -} - -#close { - margin-left:300px; - margin-top:5px; - width:100px; - height:25px; -} Deleted: jtimerhtml5/src/main/resources/html/css/alerts.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/alerts.css 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/css/alerts.css 2013-06-12 09:25:58 UTC (rev 42) @@ -1,15 +0,0 @@ -#alertCancel{ - width:70px; - height:30px; -} - -#alertSave { - width:70px; - height:30px; -} - -#head{ - right:0px; - position:fixed; - margin-right:5px -} Deleted: jtimerhtml5/src/main/resources/html/css/editionT.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/editionT.css 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/css/editionT.css 2013-06-12 09:25:58 UTC (rev 42) @@ -1,20 +0,0 @@ -#editionApply { - width:32%; - height: 30px; -} -#editionCancel { - width:32%; - height: 30px; -} -#editionClose { - width:32%; - height: 30px; -} - -#nameTask { - width:98%; -} - -#noteTask { - width:100%; -} Modified: jtimerhtml5/src/main/resources/html/css/index.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/index.css 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/css/index.css 2013-06-12 09:25:58 UTC (rev 42) @@ -28,51 +28,15 @@ padding-left:12px; } -.buttons button { - padding-right: 30px; - padding-bottom: 30px; +.selec { + width:100%; + display:inline-block; } .buttons { - margin-bottom:20px; - margin-left:20px; + margin:10px 0px 15px 10px; } -#startStopTask { - background: url("img/go-next.png"); - background-repeat:no-repeat; - background-position:center center; -} - -#newProject { - background: url("img/bookmark-new.png"); - background-repeat:no-repeat; - background-position:center center; -} - -#newTask { - background: url("img/document-new.png"); - background-repeat:no-repeat; - background-position:center center; -} - -#note { - background: url("img/notes.png"); - background-repeat:no-repeat; - background-position:center center; -} - -#alert { - background: url("img/bell.png"); - background-repeat:no-repeat; - background-position:center center; -} - -.selec { - width:100%; - display:inline-block; -} - .col { width:30%; display:inline-block; @@ -199,3 +163,57 @@ #treeTasks { list-style-type: none; } + +#editionApply { + width:49%; + height: 30px; + display:inline-block; +} + +#editionCancel { + width:49%; + height: 30px; + display:inline-block; +} + + +#dataText { + margin-left:5px; +} + +#frame { + width:99%; + min-height:155px; + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; +} + +#bt1{ + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; + cursor:pointer; + background-color:#339999; +} + +#bt2{ + border-style:solid; + border-width:2px; + border-color:#339999; + border-radius: 4px; + cursor:pointer; +} + + +#alertCancel{ + width:70px; + height:30px; +} + +#alertSave { + width:70px; + height:30px; +} Deleted: jtimerhtml5/src/main/resources/html/css/report.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/report.css 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/css/report.css 2013-06-12 09:25:58 UTC (rev 42) @@ -1,105 +0,0 @@ -#divRight{ - width:50%; - height:100%; - float:right; - margin:0; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; -} - -#divLeft{ - width:49%; - float:left; - margin:0; - height:100%; -} - -#selectThisWeek{ - background: url(img/date_current.png); - background-repeat:no-repeat; - background-position:center center; - width: 40px; - height: 22px; -} - -#selectLastWeek{ - background: url(img/date_previous.png); - background-repeat:no-repeat; - background-position:center center; - width: 40px; - height: 22px; -} - -#endDate{ - margin-left:7px; - width:70%; -} - -#startDate{ - width:70%; -} - -#textReport{ - width:96%; - height:500px; - margin-left:5px; - margin-top:10px; -} - -#generReport{ - width:17%; - min-height:30px; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; - display:inline-block; - text-align:center; - bottom:5px; -} - -#mailReport{ - width:17%; - min-height:30px; - border-style:solid; - border-width:2px; - border-color:#339999; - border-radius: 4px; - cursor:pointer; - display:inline-block; - text-align:center; - bottom:5px; -} - -#closeReport{ - width:13%; - display:inline-block; - bottom:10px; -} - -#optionsReport{ - border-style:solid; - border-width:2px; - border-color:#339999; - height:100%; - border-radius: 4px; -} - -#projectsReport{ - border-style:solid; - border-width:2px; - border-color:#339999; - height:100%; - border-radius: 4px; -} - -#monthReport{ - margin-left:50px; -} - -#yearReport{ - margin-left:24px; -} Deleted: jtimerhtml5/src/main/resources/html/css/style.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/style.css 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/css/style.css 2013-06-12 09:25:58 UTC (rev 42) @@ -1,9 +0,0 @@ - -/* Global */ - -footer { - width:100%; - position:fixed; - bottom:0px; - margin:0; -} Deleted: jtimerhtml5/src/main/resources/html/editionTask.html =================================================================== --- jtimerhtml5/src/main/resources/html/editionTask.html 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/editionTask.html 2013-06-12 09:25:58 UTC (rev 42) @@ -1,36 +0,0 @@ -<!DOCTYPE html> -<html lang="fr"> - <head> - <meta charset="UTF-8"/> - <title>Edition de la tâche</title> - <link rel="stylesheet" href="jtimer.css"/> - <script src="jtimer.js"></script> - </head> - <body> - <div id="test"></div> - <input type="text" id="nameTask" name="newNameTask" value="x"> - <!-- Calendrier à date selectionnable --> - <div id="datepicker"></div> - <footer> - Temps: - <input id="spinnerh" type="text" name="hour" value="00" size=2>: - <input id="spinnerm" type="text" name="minutes" value="00" size=2>: - <input id="spinners" type="text" name="seconds" value="00" size=2><br> - Note:<textarea rows="4" id="noteTache"></textarea><br> - <input type="button" id="editionApply" value="Appliquer"> - <input type="reset" id="editionCancel" value="Annuler"> - <input type="button" id="editionClose" value="Quitter" OnClick="javascript:window.close()"> - </footer> - <script> - $( "#datepicker" ).datepicker({ - maxDate: -1, - onSelect: function(dateText, inst){ - dateSelec(dateText); - } - }); - $("#spinnerh").spinner({ min: 0, max: 23 }); - $("#spinnerm").spinner({ min: 0, max: 59 }); - $("#spinners").spinner({ min: 0, max: 59 }); - </script> - </body> -</html> Deleted: jtimerhtml5/src/main/resources/html/img/bell.png =================================================================== (Binary files differ) Deleted: jtimerhtml5/src/main/resources/html/img/bookmark-new.png =================================================================== (Binary files differ) Deleted: jtimerhtml5/src/main/resources/html/img/document-new.png =================================================================== (Binary files differ) Deleted: jtimerhtml5/src/main/resources/html/img/go-next.png =================================================================== (Binary files differ) Deleted: jtimerhtml5/src/main/resources/html/img/notes.png =================================================================== (Binary files differ) Deleted: jtimerhtml5/src/main/resources/html/img/process-stop.png =================================================================== (Binary files differ) Modified: jtimerhtml5/src/main/resources/html/index.html =================================================================== --- jtimerhtml5/src/main/resources/html/index.html 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/index.html 2013-06-12 09:25:58 UTC (rev 42) @@ -19,7 +19,7 @@ <li class="optH" id="options"><a title="Options général" href="javascript:options()">Options</a></li> <li class="optH" id="report"><a title="Création d'un rapport" href="javascript:report()">Rapport</a></li> <li class="optH" id="about"><a title="À propos de jTimer" href="javascript:about()">À propos</a></li> - <li class="optH" id="quit"><a title="Quitter l'application" href="javascript:window.close()">Quitter</a></li> + <!--<li class="optH" id="quit"><a title="Quitter l'application" href="javascript:window.close()">Quitter</a></li>--> </ul> </div> </div> @@ -77,13 +77,7 @@ </li> </ul>--> <div class="buttons"> - <button class="onp btn" id="startStopTask" title="Démarre ou arrête la tâche sélectionnée" onclick="startStopTask()"></button> - - <button class="btn" id="newProject" title="Création d'un nouveau Projet" onclick="newProject()"></button> - <button class="btn" id="newTask" title="Création d'une nouvelle tâche" onclick="newTask()"></button> - - <button class="onp btn" id="note" title="Ajouter une annotation" onclick="addAnnotation()"></button> - <button class="onp btn" id="alert" title="Edition des Alerts" onclick="edAlerts()"></button> + Nouveau projet : <input class="input-medium" id="newProject" title="Nom du nouveau Projet"><button id="createP" class="btn btn-primary" onclick="newProject"> Créer le projet</button> </div> <div id="tabTask"> <!-- Arborescence des Tasks --> @@ -169,7 +163,6 @@ <span id="mailReport"><img src="img/mail-forward.png" alt="mail">Envoyer par email</span> </footer> <script> - /*$ jQuery(function($){ $.datepicker.regional['fr'] = { closeText: 'Fermer', @@ -189,18 +182,67 @@ yearSuffix: ''}; $.datepicker.setDefaults($.datepicker.regional['fr']); }); - (function() { - $( ".datepicker" ).datepicker({ - dateFormat: "DD dd MM yy", - regional: 'fr' - }); - });*/ + $( ".datepicker" ).datepicker({ + dateFormat: "DD dd MM yy", + regional: 'fr' + }); </script> </div> </div> + + <div id="editionTask" title="Edition de la tâche"> + <input type="text" id="nameTask" name="newNameTask" value="x"> + <!-- Calendrier à date selectionnable --> + <div id="datepicker2"></div> + Temps: + <input id="spinnerh" type="text" name="hour" value="00" size="2">: + <input id="spinnerm" type="text" name="minutes" value="00" size="2">: + <input id="spinners" type="text" name="seconds" value="00" size="2"><br> + Note:<textarea rows="4" id="noteTache"></textarea><br> + <input type="button" id="editionApply" value="Appliquer"> + <input type="reset" id="editionCancel" value="Annuler"> + <script> + $( "#datepicker2" ).datepicker({ + maxDate: -1, + /*onSelect: function(dateText, inst){ + dateSelec(dateText); + }*/ + }); + $("#spinnerh").spinner({ min: 0, max: 23 }); + $("#spinnerm").spinner({ min: 0, max: 59 }); + $("#spinners").spinner({ min: 0, max: 59 }); + </script> + </div> + <script>$( "#editionTask" ).dialog({ autoOpen: false });/*$( "#createP" ).click(function() {$( "#editionTask" ).dialog( "open" );});*/</script> + + + + <div id="aboutPopUp" title="A propos de jTimer"> + <img src="img/jtimer-logo-orange.jpg" alt="logo"/><br> + <span id="bt1" onclick="action(1)">A propos de jTimer</span> + <span id="bt2" onclick="action(2)">Licence</span><br> + <div id="frame"><p id="dataText"><b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2013, Code Lutin.<br><br><a href="http://maven-site.chorem.org/jtimer">http://maven-site.chorem.org/jtimer</a><br><br>Merci de rapporter les bugs de jTimer.</p></div> + </div> + <script>$( "#aboutPopUp" ).dialog({ autoOpen: false });</script> + + + + <div id="alerts" title="Alertes de la tâche"> + <span id="blockAlerte"> + <b>Listes des alertes :</b> + <input type="button" id="alertCancel" value="Annuler" OnClick="javascript:window.close()"> + <input type="button" id="alertSave" value="Sauver"> + </span> + <br> + <br> + <div id="listAlerts">Type & Durée<br><br> + </div> + <input type="button" id="alertAdd" value="Ajouter" onclick="add()"> + </div> + <script>$( "#alerts" ).dialog({ autoOpen: false });$( "#createP" ).click(function() {$( "#alerts" ).dialog( "open" );});</script> </body> <script>$(".brand").css("color","#ff7a04");$("#opts").css("display","none");selection();$(".onp").css("display","none");$("#newTask").css("display","none");$("#reportpage").css("display","none");</script> </html> Deleted: jtimerhtml5/src/main/resources/html/js/alerts.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/alerts.js 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/js/alerts.js 2013-06-12 09:25:58 UTC (rev 42) @@ -1,20 +0,0 @@ -// trouver un moyen de supprimer les rows. -var rows = 0; - -function add(){ - rows++; - $('#listAlerts').append("<div id='num"+rows+"'><select><option value='rdt'>REACH_DAILY_TIME</option><option value='rtt'>REACH_TOTAL_TIME</option></select><input class='spinnerh' type='text' size='2'>h<input class='spinnerm' type='text' size='2'>m<input class='spinners' type='text' size='2'>s <input type='button' value='X' onclick='suppr("+rows+")'></div>"); - $(".spinnerh").spinner({ min: 0}); - $(".spinnerm").spinner({ min: 0, max: 59 }); - $(".spinners").spinner({ min: 0, max: 59 }); -} - -function suppr(n){ - $("#num"+n).html(''); -} - -function save(){ - $.get('http://services/alerts/save',function(data){ - alert(data); - }); -} Deleted: jtimerhtml5/src/main/resources/html/js/editionT.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/editionT.js 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/js/editionT.js 2013-06-12 09:25:58 UTC (rev 42) @@ -1,9 +0,0 @@ -//réflechir à comment oppéré les modification ! - -function dateSelec(date){ - -} - -$("#editionApply").click(function(){ - //pour chaque modification on envois une requète .get par tâche ? -}); Added: jtimerhtml5/src/main/resources/html/js/index.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/index.js (rev 0) +++ jtimerhtml5/src/main/resources/html/js/index.js 2013-06-12 09:25:58 UTC (rev 42) @@ -0,0 +1,256 @@ +var tabProjects = new Array(); +var tabTasks = new Array(); +var elemSelec = ""; +var opt = false; +var rpt = false; + + +function getProjects(){ + $.getJSON('http://localhost:8080/other/getProjects',function(data) { + for (var i in data){ + tabProjects[data[i].number] = data[i]; + } + }); +} + +function getChilds(p){ + $.getJSON('http://localhost:8080/task/getTasks/'+p,function(data) { + tabTasks[p] = new Array(); + for (var i in data){ + tabTasks[p][i] = data[i]; + } + }); +} + +function showHideChilds(t){ + $("#subT"+t).css(); +} + +function timeToday(i){ + return 0;//tabProjects[i].allDaysTimes.;//aujourd'hui +} + +function timeTotal(i){ + var nb = 0; + for (var t in tabProjects[i].allDaysTimes){ + nb = nb + tabProjects[i].allDaysTimes.t; + } + return nb; +} + +$(".selec").click( function(){ + $("#"+elemSelec).css('background-color',''); + elemSelec = this.id; + $("#"+elemSelec).css('background-color','#A9EAFE'); +}); + +var myVar; + +function startStopTask(){ + myVar = setInterval(function(){chrono(elemSelec)},1000); +} + +function chrono(task){ + var timeauj = $("#auj"+task).html() // a rajouter directement dans le tableau puis à mettre à jour sur la page, et ne pas oublier de le répercuté sur les parents + $("#auj"+task).html(timeauj+1) + var timetot = $("#tot"+task).html() + $("#tot"+task).html(timetot+1) +} + +function options(){ + if (opt){ + $("#opts").css("display","none"); + $("#options").removeClass("active"); + opt = false; + } + else { + $("#opts").css("display",""); + $("#options").addClass("active"); + opt = true; + } +} + +function selection() { + $(".selec").click( function(){ + $("#"+elemSelec).css('background-color',''); + elemSelec = this.id; + $("#"+elemSelec).css('background-color','#A9EAFE'); + if(elemSelec.charAt(0)=="p"){ + $(".onp").css("display","none"); + $("#newTask").css("display",""); + } + else if(elemSelec.charAt(0)=="t"){ + $(".onp").css("display",""); + $("#newTask").css("display",""); + } + }); +} + +function report(){ + if (rpt){ + $("#reportpage").css("display","none"); + $("#jtimer").css("display",""); + $("#report").removeClass("active"); + rpt = false; + } + else { + $("#reportpage").css("display",""); + $("#jtimer").css("display","none"); + $("#report").addClass("active"); + rpt = true; + } +} + +var check = false; +function checkTimeMark(){ + if (check==false){ + check=true; + $("#withTimeMark").css("display",""); + } + else + { + check=false; + $("#withTimeMark").css("display","none"); + } +} + +function edAlerts(){ + window.open('alerts.html','','height=400, width=600, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no'); +} + +function about(){ + window.open('about.html','','height=405, width=420, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no'); +} + +/* Différente actions des menus et des boutons */ + +function newProject(parent){ + var nameNewProject = prompt("Nom du Projet à créer :", "" ); + if (nameNewProject=="") { + alert("Erreur : Le nom est vide !"); + } + else { + var newproject = "{}"; //le nouveau projet en format json + $.get('http://localhost:8080/other/addProject/'+newproject,function(data){ + alert(data); + }); + } + // vérifier si un autre projet n'a pas déjà ce nom +} + +function edProject(){ + var newnameProject = prompt("Nouveau nom du Projet :","x"); + if (newnameProject=="") { + alert("Erreur : Le nom est vide !"); + } + else { + $.get('http://localhost:8080/project/modifyProject/'+tabProjects[elemSelec.substring(1,elemSelec.length)],function(data){ + alert(data); + }); + } + // vérifier si un autre projet n'a pas déjà ce nom +} + +function ofProject(){ + $.get('http://localhost:8080/task/changeClosedState/'+tabProjects[elemSelec.substring(1,elemSelec.length)],function(data){ + alert(data); + }); +} + +function supprProject() { + var bool = confirm("Voulez-vous supprimer le Projet x ?") + if (bool){ + $.get('http://localhost:8080/project/deleteProject/'+elemSelec.substring(1,elemSelec.length),function(data){ + alert(data); + }); + } +} + +function newTask() { + var nameNewTask = prompt("Nom de la tâche à créer pour x :", "" ); + if (nameNewTask=="") { + alert("Erreur : Le nom est vide !"); + } + else { + $.get('http://localhost:8080/task/addTask/'+nameNewTask,function(data){ + alert(data); + }); + } + // vérifier si une autre tâche n'a pas déjà ce nom au même niveau +} + +function edTask(){ + window.open('editionTask.html','','height=450, width=350, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no'); +} + +function ofTask(){ + $.get('http://localhost:8080/task/changeClosedState/'+elemSelec.substring(1,elemSelec.length),function(data){ + alert(data); + }); +} + +function supprTask(){ + var bool = confirm("Voulez-vous supprimer la tâche x ?"); + if (bool){ + $.get('http://localhost:8080/task/deleteTask/'+elemSelec.substring(1,elemSelec.length),function(data){ + alert(data); + }); + } +} + +function saveTask(){ + +} + +function fusion(){ + $.get('http://localhost:8080/task/fusion',function(data){ + alert(data); + }); +} + +function systray(){ + $.get('http://localhost:8080/task/systray',function(data){ + alert(data); + }); +} + +function dStartWeek(day){ + $.get('http://localhost:8080/task/dStartWeek/'+day,function(data){ + alert(data); + }); +} + + + + +function action(i){ + if(i == 1){ + $('#dataText').html('<b>jTimer - 1.4.1</b><br><br>Copyright 2007 - 2012, Code Lutin.<br><br><a href="http://maven-site.chorem.org/jtimer">http://maven-site.chorem.org/jtimer</a><br><br>Merci de rapporter les bugs de jTimer.'); + $('#bt1').css('background',"#339999"); + $('#bt2').css('background',"#ffffff"); + } + if(i == 2){ + $('#dataText').html("Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec jTimer. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme."); + $('#bt2').css('background',"#339999"); + $('#bt1').css('background',"#ffffff"); + } +} + +function about(){ + $( "#aboutPopUp" ).dialog( "open" ); +} + + +var rows = 0; + +function add(){ + rows++; + $('#listAlerts').append("<div id='num"+rows+"'><select><option value='rdt'>REACH_DAILY_TIME</option><option value='rtt'>REACH_TOTAL_TIME</option></select><input class='spinnerh' type='text' size='2'>h<input class='spinnerm' type='text' size='2'>m<input class='spinners' type='text' size='2'>s <input type='button' value='X' onclick='suppr("+rows+")'></div>"); + $(".spinnerh").spinner({ min: 0}); + $(".spinnerm").spinner({ min: 0, max: 59 }); + $(".spinners").spinner({ min: 0, max: 59 }); +} + +function suppr(n){ + $("#num"+n).html(''); +} Deleted: jtimerhtml5/src/main/resources/html/js/jtimer.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/jtimer.js 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/js/jtimer.js 2013-06-12 09:25:58 UTC (rev 42) @@ -1,214 +0,0 @@ -var tabProjects = new Array(); -var tabTasks = new Array(); -var elemSelec = ""; -var opt = false; -var rpt = false; - - -function getProjects(){ - $.getJSON('http://localhost:8080/other/getProjects',function(data) { - for (var i in data){ - tabProjects[data[i].number] = data[i]; - } - }); -} - -function getChilds(p){ - $.getJSON('http://localhost:8080/task/getTasks/'+p,function(data) { - tabTasks[p] = new Array(); - for (var i in data){ - tabTasks[p][i] = data[i]; - } - }); -} - -function showHideChilds(t){ - $("#subT"+t).css(); -} - -function timeToday(i){ - return 0;//tabProjects[i].allDaysTimes.;//aujourd'hui -} - -function timeTotal(i){ - var nb = 0; - for (var t in tabProjects[i].allDaysTimes){ - nb = nb + tabProjects[i].allDaysTimes.t; - } - return nb; -} - -$(".selec").click( function(){ - $("#"+elemSelec).css('background-color',''); - elemSelec = this.id; - $("#"+elemSelec).css('background-color','#A9EAFE'); -}); - -var myVar = setInterval(function(){startStopTask()},1000); - -function startStopTask(){ - -} - -function options(){ - if (opt){ - $("#opts").css("display","none"); - $("#options").removeClass("active"); - opt = false; - } - else { - $("#opts").css("display",""); - $("#options").addClass("active"); - opt = true; - } -} - -function selection() { - $(".selec").click( function(){ - $("#"+elemSelec).css('background-color',''); - elemSelec = this.id; - $("#"+elemSelec).css('background-color','#A9EAFE'); - if(elemSelec.charAt(0)=="p"){ - $(".onp").css("display","none"); - $("#newTask").css("display",""); - } - else if(elemSelec.charAt(0)=="t"){ - $(".onp").css("display",""); - $("#newTask").css("display",""); - } - }); -} - -function report(){ - if (rpt){ - $("#reportpage").css("display","none"); - $("#jtimer").css("display",""); - $("#report").removeClass("active"); - rpt = false; - } - else { - $("#reportpage").css("display",""); - $("#jtimer").css("display","none"); - $("#report").addClass("active"); - rpt = true; - } -} - -var check = false; -function checkTimeMark(){ - if (check==false){ - check=true; - $("#withTimeMark").css("display",""); - } - else - { - check=false; - $("#withTimeMark").css("display","none"); - } -} - -function edAlerts(){ - window.open('alerts.html','','height=400, width=600, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no'); -} - -function about(){ - window.open('about.html','','height=405, width=420, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no'); -} - -/* Différente actions des menus et des boutons */ - -function newProject(parent){ - var nameNewProject = prompt("Nom du Projet à créer :", "" ); - if (nameNewProject=="") { - alert("Erreur : Le nom est vide !"); - } - else { - var newproject = "{}"; //le nouveau projet en format json - $.get('http://localhost:8080/other/addProject/'+newproject,function(data){ - alert(data); - }); - } - // vérifier si un autre projet n'a pas déjà ce nom -} - -function edProject(){ - var newnameProject = prompt("Nouveau nom du Projet :","x"); - if (newnameProject=="") { - alert("Erreur : Le nom est vide !"); - } - else { - $.get('http://localhost:8080/project/modifyProject/'+tabProjects[elemSelec.substring(1,elemSelec.length)],function(data){ - alert(data); - }); - } - // vérifier si un autre projet n'a pas déjà ce nom -} - -function ofProject(){ - $.get('http://localhost:8080/task/changeClosedState/'+tabProjects[elemSelec.substring(1,elemSelec.length)],function(data){ - alert(data); - }); -} - -function supprProject() { - var bool = confirm("Voulez-vous supprimer le Projet x ?") - if (bool){ - $.get('http://localhost:8080/project/deleteProject/'+elemSelec.substring(1,elemSelec.length),function(data){ - alert(data); - }); - } -} - -function newTask() { - var nameNewTask = prompt("Nom de la tâche à créer pour x :", "" ); - if (nameNewTask=="") { - alert("Erreur : Le nom est vide !"); - } - else { - $.get('http://localhost:8080/task/addTask/'+nameNewTask,function(data){ - alert(data); - }); - } - // vérifier si une autre tâche n'a pas déjà ce nom au même niveau -} - -function edTask(){ - window.open('editionTask.html','','height=450, width=350, toolbar=no, menubar=no, scrollbars=no, resizable=yes, location=no, status=no'); -} - -function ofTask(){ - $.get('http://localhost:8080/task/changeClosedState/'+elemSelec.substring(1,elemSelec.length),function(data){ - alert(data); - }); -} - -function supprTask(){ - var bool = confirm("Voulez-vous supprimer la tâche x ?"); - if (bool){ - $.get('http://localhost:8080/task/deleteTask/'+elemSelec.substring(1,elemSelec.length),function(data){ - alert(data); - }); - } -} - -function saveTask(){ - -} - -function fusion(){ - $.get('http://localhost:8080/task/fusion',function(data){ - alert(data); - }); -} - -function systray(){ - $.get('http://localhost:8080/task/systray',function(data){ - alert(data); - }); -} - -function dStartWeek(day){ - $.get('http://localhost:8080/task/dStartWeek/'+day,function(data){ - alert(data); - }); -} Deleted: jtimerhtml5/src/main/resources/html/js/report.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/report.js 2013-06-11 14:28:24 UTC (rev 41) +++ jtimerhtml5/src/main/resources/html/js/report.js 2013-06-12 09:25:58 UTC (rev 42) @@ -1,12 +0,0 @@ -var check = false; -function checkTimeMark(){ - if (check==false){ - check=true; - $("#withTimeMark").css("display",""); - } - else - { - check=false; - $("#withTimeMark").css("display","none"); - } -} Added: jtimerhtml5/target/antrun/build-main.xml =================================================================== --- jtimerhtml5/target/antrun/build-main.xml (rev 0) +++ jtimerhtml5/target/antrun/build-main.xml 2013-06-12 09:25:58 UTC (rev 42) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<project name="maven-antrun-" default="main" > +<target name="main"> + <mkdir dir="/home/quentin/Projet/jtimerhtml5/target/surefire-workdir"/> +</target> +</project> \ No newline at end of file Added: jtimerhtml5/target/jtimer-2.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/jtimer-2.0-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/commons-beanutils-1.8.3.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/commons-beanutils-1.8.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/commons-collections-3.2.1.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/commons-collections-3.2.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/commons-io-2.3.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/commons-io-2.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/commons-logging-1.1.1.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/commons-logging-1.1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/commons-primitives-1.0.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/commons-primitives-1.0.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/gson-2.2.4.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/gson-2.2.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/h2-1.3.170.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/h2-1.3.170.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/javafx-2.2.3.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/javafx-2.2.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/javax.servlet-3.0.0.v201112011016.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/javax.servlet-3.0.0.v201112011016.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/jetty-http-9.0.3.v20130506.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/jetty-http-9.0.3.v20130506.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/jetty-io-9.0.3.v20130506.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/jetty-io-9.0.3.v20130506.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/jetty-server-9.0.3.v20130506.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/jetty-server-9.0.3.v20130506.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/jetty-util-9.0.3.v20130506.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/jetty-util-9.0.3.v20130506.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/nuiton-i18n-2.4.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/nuiton-i18n-2.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/lib/nuiton-utils-2.2.jar =================================================================== (Binary files differ) Property changes on: jtimerhtml5/target/lib/nuiton-utils-2.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jtimerhtml5/target/maven-archiver/pom.properties =================================================================== --- jtimerhtml5/target/maven-archiver/pom.properties (rev 0) +++ jtimerhtml5/target/maven-archiver/pom.properties 2013-06-12 09:25:58 UTC (rev 42) @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jun 12 11:21:21 CEST 2013 +version=2.0-SNAPSHOT +groupId=org.chorem +artifactId=jtimer