Author: qmoriceau Date: 2013-06-19 11:47:22 +0200 (Wed, 19 Jun 2013) New Revision: 46 Url: http://chorem.org/projects/incubator/repository/revisions/46 Log: L?\195?\169g?\195?\168res modification sur l'interface Added: 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/ Modified: jtimerhtml5/src/main/resources/html/css/index.css jtimerhtml5/src/main/resources/html/index.html jtimerhtml5/src/main/resources/html/js/index.js Modified: jtimerhtml5/src/main/resources/html/css/index.css =================================================================== --- jtimerhtml5/src/main/resources/html/css/index.css 2013-06-14 12:52:26 UTC (rev 45) +++ jtimerhtml5/src/main/resources/html/css/index.css 2013-06-19 09:47:22 UTC (rev 46) @@ -29,17 +29,11 @@ } .colHT { - width:30%; + width:32%; display:inline-block; text-align:center; } -.optHT { - width:8%; - display:inline-block; - text-align:center; -} - #opts span { display:inline-block; padding-left:12px; @@ -56,16 +50,10 @@ } .col { - width:30%; + width:33%; display:inline-block; } -.optT,.optP { - width:5%; - display:inline-block; - float:right; -} - #headTasks { margin-bottom:8px; } Modified: jtimerhtml5/src/main/resources/html/index.html =================================================================== --- jtimerhtml5/src/main/resources/html/index.html 2013-06-14 12:52:26 UTC (rev 45) +++ jtimerhtml5/src/main/resources/html/index.html 2013-06-19 09:47:22 UTC (rev 46) @@ -54,41 +54,8 @@ <div id="tabTask"> <!-- Arborescence des Tasks --> - <div id="headTasks"><span class='colHT'>Projet et tâches</span><span class='colHT'>Aujourd'hui</span><span class='colHT'>Total</span><span class="optHT">Options</span></div> - <ul id="treeTasks"><!--<li> - <!--<div class="selec" id="p1"> - <span class='col'><span>▼</span>html5</span> - <span class='col' id="aujp1">01:24:58</span> - <span class='col' id="totp1">13:25:32</span> - <span class="optP"><button class="btn btn-info"></button></span> - </div> - <ul class="subtask"> - <li> - <div class="selec" id="t5"><img class="run" alt="run" src="img/running.gif"> - <span class='col' id='titlet5'>Documentation</span> - <span class='col' id="aujt5">01:00:02</span> - <span class='col' id="tott5">06:54:24</span> - <span class="optT"><button class="btn btn-info"></button></span> - </div> - </li> - <li> - <div class="selec" id="t9"><img class="run" alt="run" src="img/running.gif"> - <span class='col' id='titlet9'>Interface</span> - <span class='col' id="aujt9">00:24:56</span> - <span class='col' id="tott9">06:31:07</span> - <span class="optT"><button class="btn btn-info"></button></span> - </div> - </li> - </ul> - </li> - <li> - <div class="selec" id="p4"> - <span class='col'><span>►</span>New Project</span> - <span class='col' id="aujp4">00:00:00</span> - <span class='col' id="totp4">00:00:00</span> - <span class="optP"><button class="btn btn-info"></button></span> - </div> - </li>--> + <div id="headTasks"><span class='colHT'>Projet et tâches</span><span class='colHT'>Aujourd'hui</span><span class='colHT'>Total</span></div> + <ul id="treeTasks"> </ul> </div> <footer class="footer"> @@ -159,7 +126,7 @@ <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 id="frame"><p id="dataText"><b>jTimer - 2.0-SNAPSHOT</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> </div> @@ -176,51 +143,9 @@ </div> <input type="button" id="alertAdd" value="Ajouter" onclick="add()"> </div> - - - - <div class="btn-group col" id="optP"> - <button class="btn btn-info">Action</button> - <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> </button> - <ul class="dropdown-menu"> - <li><a title="Création d'une nouvelle tâche" href="javascript:newTask()"><i class="icon-time"></i> Nouvelle tâche</a></li> - <li class="divider"></li> - <li><a title="Édition du projet" href="javascript:edProject()"><i class="icon-pencil"></i> Éditer</a></li> - <li><a title="Ouvrir ou fermer le projet" href="javascript:ofProject()"><i class="icon-off"></i> Ouvrir/Fermer</a></li> - <li><a title="Suppression du Projet" href="javascript:supprProject()"><i class="icon-trash"></i> Supprimer</a></li> - </ul> - </div> - - <div class="btn-group" id="optT"> - <button class="btn btn-info">Action</button> - <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> </button> - <ul class="dropdown-menu"> - <li><a title="Création d'une nouvelle tâche" href="javascript:newTask()"><i class="icon-time"></i> Nouvelle tâche</a></li> - <li class="divider"></li> - <li><a title="Édition de la tâche" href="javascript:edTask()"><i class="icon-pencil"></i> Éditer</a></li> - <li><a title="Ouvrir ou fermer la tâche" href="javascript:ofTask()"><i class="icon-off"></i> Ouvrir/Fermer</a></li> - <li><a title="Suppression de la tâche" href="javascript:supprTask()"><i class="icon-trash"></i> Supprimer</a></li> - <li class="divider"></li> - <li><a title="Démarrage de la tâche" href="javascript:startTask()"><i class="icon-play-circle"></i> Démarrer</a></li> - <li><a title="Arrêt de la tâche" href="javascript:stopTask()"><i class="icon-stop"></i> Arrêter</a></li> - <li class="divider"></li> - <li><a title="Ajout d'une annotation" href="javascript:addAnnotation()"><i class="icon-file"></i> Ajouter une annotation</a></li> - <li><a title="Édition des alertes" href="javascript:edAlerts()"><i class="icon-bell"></i> Éditer les Alertes</a></li> - <li><a title="Ajout de 1 minute à la tâche" href="javascript:addsou(1)"><i class="icon-plus-sign"></i> Ajouter 1 minute</a></li> - <li><a title="Ajout de 5 minutes à la tâche" href="javascript:addsou(5)"><i class="icon-plus-sign"></i> Ajouter 5 minutes</a></li> - <li><a title="Ajout de 30 minutes à la tâche" href="javascript:addsou(30)"><i class="icon-plus-sign"></i> Ajouter 30 minutes</a></li> - <li><a title="Enlève 1 minute à la tâche" href="javascript:addsou(-1)"><i class="icon-minus-sign"></i> Enlever 1 minute</a></li> - <li><a title="Enlève 5 minutes à la tâche" href="javascript:addsou(-5)"><i class="icon-minus-sign"></i> Enlever 5 minutes</a></li> - <li><a title="Enlève 30 minutes à la tâche" href="javascript:addsou(-30)"><i class="icon-minus-sign"></i> Enlever 30 minutes</a></li> - <li><a title="Remet la tâche à zero" href="javascript:zero()"><i class="icon-repeat"></i> Remettre à Zero</a></li> - </ul> - </div> - - - </body> <script>init();</script> </html> Modified: jtimerhtml5/src/main/resources/html/js/index.js =================================================================== --- jtimerhtml5/src/main/resources/html/js/index.js 2013-06-14 12:52:26 UTC (rev 45) +++ jtimerhtml5/src/main/resources/html/js/index.js 2013-06-19 09:47:22 UTC (rev 46) @@ -4,10 +4,10 @@ var elemSelec = ""; var opt = false; var rpt = false; -var btP = "<div class='btn-group optP' id='optP'><button class='btn btn-info'>Action</button><button class='btn btn-info dropdown-toggle' data-toggle='dropdown'> <span class='caret'></span> </button><ul class='dropdown-menu'><li><a title='Création d'une nouvelle tâche' href='javascript:newTask()'><i class='icon-time'></i> Nouvelle tâche</a></li><li class='divider'></li><li><a title='Édition du projet' href='javascript:edProject()'><i class='icon-pencil'></i> Éditer</a></li><li><a title='Ouvrir ou fermer le projet' href='javascript:ofProject()'><i class='icon-off'></i> Ouvrir/Fermer</a></li><li><a title='Suppression du Projet' href='javascript:supprProject()'><i class='icon-trash'></i> Supprimer</a></li></ul></div>"; -var btT; +var bt1 = "<div class='btn-group optP' id='optP'><button class='btn btn-info' data-toggle='buttons-radio'>"; +var btP2 = "</button><button class='btn btn-info dropdown-toggle' data-toggle='dropdown'> <span class='caret'></span> </button><ul class='dropdown-menu'><li><a title='Création d'une nouvelle tâche' href='javascript:newTask()'><i class='icon-time'></i> Nouvelle tâche</a></li><li class='divider'></li><li><a title='Édition du projet' href='javascript:edProject()'><i class='icon-pencil'></i> Éditer</a></li><li><a title='Ouvrir ou fermer le projet' href='javascript:ofProject()'><i class='icon-off'></i> Ouvrir/Fermer</a></li><li><a title='Suppression du Projet' href='javascript:supprProject()'><i class='icon-trash'></i> Supprimer</a></li></ul></div>"; +var btT2 = "</button><button class='btn btn-info dropdown-toggle' data-toggle='dropdown'> <span class='caret'></span> </button><ul class='dropdown-menu'><li><a title='Création d'une nouvelle tâche' href='javascript:newTask()'><i class='icon-time'></i> Nouvelle tâche</a></li><li class='divider'></li><li><a title='Édition de la tâche' href='javascript:edTask()'><i class='icon-pencil'></i> Éditer</a></li><li><a title='Ouvrir ou fermer la tâche' href='javascript:ofTask()'><i class='icon-off'></i> Ouvrir/Fermer</a></li><li><a title='Suppression de la tâche' href='javascript:supprTask()'><i class='icon-trash'></i> Supprimer</a></li><li class='divider'></li><li><a title='Démarrage de la tâche' href='javascript:startTask()'><i class='icon-play-circle'></i> Démarrer</a></li><li><a title='Arrêt de la tâche' href='javascript:stopTask()'><i class='icon-stop'></i> Arrêter</a></li><li class='divider'></li><li><a title='Ajout d'une annotation' href='javascript:addAnnotation()'><i class='icon-file'></i> Ajouter une annotation</a></li><li><a title='Édition des alertes' href='javascript:edAlerts()'><i class='icon-bell'></i> Éditer les Alertes</a></li><li><a title='Ajout de 1 minute à la tâche' href='javascript:addsou(1)'><i class='icon-plus-sign'></i> Ajouter 1 minute</a></li><li><a title='Ajout de 5 minutes à la tâche' href='javascript:addsou(5)'><i class='icon-plus-sign'></i> Ajouter 5 minutes</a></li><li><a title='Ajout de 30 minutes à la tâche' href='javascript:addsou(30)'><i class='icon-plus-sign'></i> Ajouter 30 minutes</a></li><li><a title='Enlève 1 minute à la tâche' href='javascript:addsou(-1)'><i class='icon-minus-sign'></i> Enlever 1 minute</a></li><li><a title='Enlève 5 minutes à la tâche' href='javascript:addsou(-5)'><i class='icon-minus-sign'></i> Enlever 5 minutes</a></li><li><a title='Enlève 30 minutes à la tâche' href='javascript:addsou(-30)'><i class='icon-minus-sign'></i> Enlever 30 minutes</a></li><li><a title='Remet la tâche à zero' href='javascript:zero()'><i class='icon-repeat'></i> Remettre à Zero</a></li></ul></div>"; - function getProjects(){ $.getJSON('http://localhost:8080/tasks/getProjects',function(data) { for (var i in data){ @@ -21,7 +21,7 @@ $("#treeTasks").html(""); alert(tabProjects.length); for (var p in tabProjects){ - $("#treeTasks").append("<li><div class='selec' id='p"+p+"'><span class='col'><span>▼</span>"+tabProjects[p].name+"</span><span class='col' id='aujp"+p+"'>"+formatTime(timeToday(p))+"</span><span class='col' id='totp"+p+"'>"+formatTime(timeTotal(p))+"</span>"+btP+"</div></li>"); + $("#treeTasks").append("<li><div class='selec' id='p"+p+"'><span class='col'>"+bt1+tabProjects[p].name+btP2+"</span><span class='col' id='aujp"+p+"'>"+formatTime(timeToday(p))+"</span><span class='col' id='totp"+p+"'>"+formatTime(timeTotal(p))+"</span></div></li>"); } selection(); } @@ -50,7 +50,8 @@ } function timeToday(i){ - return 0;//tabProjects[i].allDaysTimes.;//aujourd'hui + //return tabProjects[i].allDaysTimes./*aujourd'hui*/; + return 0; } function timeTotal(i){ @@ -76,24 +77,29 @@ function startStopTask(elem){ if(displayElemT[elem].run==null){ displayElemT[elem].run = true; + myVar = setInterval(function(){chrono(elem)},1000); $("#"+elem+" .run").css("display",""); } else if (displayElemT[elem].run){ displayElemT[elem].run = false; + clearInterval(myVar); $("#"+elem+" .run").css("display","none"); } else { displayElemT[elem].run = true; + myVar = setInterval(function(){chrono(elem)},1000); $("#"+elem+" .run").css("display",""); } // myVar = setInterval(function(){chrono(elem)},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); + + //tabProjects[elemSelec.substring(1,elemSelec.length)].allDaysTime./*aujourd'hui*/ = tabProjects[elemSelec.substring(1,elemSelec.length)].allDaysTime./*aujourd'hui*/ + 1000; + + // ne pas oublier de le répercuté sur les parents + $("#auj"+task).html(formatTime(timeToday(p))); + $("#tot"+task).html(formatTime(timeTotal(p))); } function options(){ @@ -111,17 +117,7 @@ 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",""); - } }); } @@ -161,12 +157,17 @@ function newProject(parent){ var nameNewProject = $("#newProject").val(); - var newproject = "{'name'='"+nameNewProject+"', 'number'='-1', 'closed'=false, 'allDaysTime'={}, 'allDaysAnnotations'={}, 'alerts'=[]}"; - $.ajax({ - type: 'PUT', - url: 'http://localhost:8080/tasks/addProject/'+newproject - }); - getProjects(); + if (nameNewProject==="") { + alert("Erreur : Le nom est vide !"); + } + else { + var newproject = "{'name'='"+nameNewProject+"', 'number'='-1', 'closed'=false, 'allDaysTime'={}, 'allDaysAnnotations'={}, 'alerts'=[]}"; + $.ajax({ + type: 'PUT', + url: 'http://localhost:8080/tasks/addProject/'+newproject + }); + getProjects(); + } // vérifier si un autre projet n'a pas déjà ce nom } @@ -272,7 +273,7 @@ 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.'); + $('#dataText').html('<b>jTimer - 2.0-SNAPSHOT</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"); } Added: jtimerhtml5/target/antrun/build-main.xml =================================================================== --- jtimerhtml5/target/antrun/build-main.xml (rev 0) +++ jtimerhtml5/target/antrun/build-main.xml 2013-06-19 09:47:22 UTC (rev 46) @@ -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-19 09:47:22 UTC (rev 46) @@ -0,0 +1,5 @@ +#Generated by Maven +#Fri Jun 14 16:10:02 CEST 2013 +version=2.0-SNAPSHOT +groupId=org.chorem +artifactId=jtimer