May 2012 - Chorem-commits - mailman.cloud.codelutin.com

r166 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions resources
by bpoussin＠users.chorem.org May 31, 2012

May 31, 2012

Author: bpoussin Date: 2012-05-31 18:55:38 +0200 (Thu, 31 May 2012) New Revision: 166 Url: http://chorem.org/repositories/revision/chorem/166 Log: rewrite searchAsMap with new wikitty functionnality Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/resources/log4j.properties Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-05-31 14:01:50 UTC (rev 165) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-05-31 16:55:38 UTC (rev 166) @@ -27,6 +27,9 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import org.chorem.ChoremConfig; +import org.chorem.ChoremConfigOption; +import org.nuiton.wikitty.entities.ElementField; /** * @@ -93,8 +96,74 @@ } + /** + * Fait une recherche et retourne le resultat dans une map avec comme cle + * le nom de l'extension et comme valeur une liste de Wikitty qui correspond + * aux criteres de recherche. + * + * Recherche avec la possilite d'indiquer le niveau de profondeur de recherche + * pour les champs de type wikitty. + * + * @param client objet injecte par le framework webmotion/chorem + * @param extension la liste des extensions que peut/doit avoir l'objet resultat + * Si vide alors on fait la recherche sur toutes les extensions disponibles + * dans la base. + * @param query la restriction a appliquer en plus des extensions + * @param depth le niveau de profondeur de recherche + * @return une Map{extensionName: liste de wikitty} + */ + // depth est un Integer car si c'est un int et qu'il n'existe pas dans les parametres + // l'appel plante au lieu de passer 0 comme valeur par defaut + public LinkedHashMultimap<String, Wikitty> searchAsMap(ChoremClient client, String[] extension, String query, Integer depth) { + if (depth == null) { + depth = 0; + } + + WikittyQuery q; + + if (extension != null) { + q = new WikittyQueryMaker().and() + .extContainsOne(Arrays.asList(extension)) + .parse(query) + .end(); + } else { + q = new WikittyQueryMaker() + .parse(query) + .end(); + } + q.setWikittyFieldSearchDepth(depth); + + // on essai de trier les resultats au mieux tout en ne faisant qu'un requete + Collection<WikittyExtension> exts = client.restoreExtensionLastVersion(extension); + for (WikittyExtension ext : exts) { + q.addSortAscending(ext.getSortAscending().toArray(new ElementField[0])); + q.addSortDescending(ext.getSortDescending().toArray(new ElementField[0])); + } + + + WikittyQueryResult<Wikitty> results = + client.findAllByQuery(Wikitty.class, q); + + // on classe par extension demande les resultats + LinkedHashMultimap<String, Wikitty> map = LinkedHashMultimap.create(); + for (Wikitty w : results) { + for (String ext : w.getExtensionNames()) { + map.put(ext, w); + } + } + + List<String> extExcluded = client.getConfig().getOptionAsList( + ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption(); + for (String ext : extExcluded) { + map.removeAll(ext); + } + + return map; + + } + public Render search(ChoremClient client, String[] extension, String query) { - LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, extension, query); + LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, extension, query, 1); return renderView("search.jsp", "result", map); } @@ -131,7 +200,7 @@ // query += " AND ("+extensionRestriction+")"; // } - LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, extension, query); + LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, extension, query, 1); List<Map<String, String>> result = new ArrayList<Map<String, String>>(map.size()); for (Map.Entry<String, Wikitty> e : map.entries()) { String extName = e.getKey(); @@ -164,7 +233,8 @@ * @param query la restriction a appliquer en plus des extensions * @return une Map{extensionName: liste de wikitty} */ - protected LinkedHashMultimap<String, Wikitty> searchAsMap( + // FIXME poussin 20120531 a supprimer lorsque le searchAsMap fonctionnera bien + protected LinkedHashMultimap<String, Wikitty> searchAsMapOld( ChoremClient client, String[] extension, String query) { boolean expliciteExtension = false; Collection<String> extNames; @@ -211,7 +281,7 @@ // on ajoute pour chaque champs precharge, la meme condition // par exemple cela permet lorsqu'on recherche un 'Employee' de // recherche aussi sur le nom de la personne ou de la societe - String [] preload = StringUtils.split(ext.getTagValue(WikittyTagValue.TAG_PRELOAD), ";"); + String [] preload = null;//FIXME test StringUtils.split(ext.getTagValue(WikittyTagValue.TAG_PRELOAD), ";"); if (preload == null) { // si pas de preload, on ajoute directement la restriction queryMaker.condition(q.getCondition()); @@ -387,7 +457,7 @@ */ public Render searchRelated(ChoremClient client, String id) { String query = id + " AND id != " + id; - LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, null, query); + LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, null, query, 0); return renderView("search.jsp", "result", map); } } Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties =================================================================== --- trunk/chorem-webmotion/src/main/resources/log4j.properties 2012-05-31 14:01:50 UTC (rev 165) +++ trunk/chorem-webmotion/src/main/resources/log4j.properties 2012-05-31 16:55:38 UTC (rev 166) @@ -32,3 +32,4 @@ # package level log4j.logger.org.chorem=DEBUG log4j.logger.org.nuiton=INFO +#log4j.logger.org.nuiton.wikitty.storage.solr.SolrUtil=DEBUG

1 0

r165 - trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by ymartel＠users.chorem.org May 31, 2012

May 31, 2012

Author: ymartel Date: 2012-05-31 16:01:50 +0200 (Thu, 31 May 2012) New Revision: 165 Url: http://chorem.org/repositories/revision/chorem/165 Log: Add an upload for wikitty binary field Enable autocompletion for wikitty wikitty field (without specific extension needed) Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-31 08:12:17 UTC (rev 164) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-31 14:01:50 UTC (rev 165) @@ -129,7 +129,7 @@ protected void inputBinary(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - /*{<input type="text" name="<%=name%>" <%=getDynamicAttribute()%>/>"}*/ + /*{<input type="file" name="<%=name%>" <%=getDynamicAttribute()%>/>"}*/ } protected void inputBoolean(JspWriter output, String contextPath, String name, @@ -236,7 +236,12 @@ String id = wikitty.getId() + "-" + extName + "-" + fieldName; String value = wikitty.getFieldAsWikitty(extName, fieldName); Wikitty wikittyValue = wikitty.getFieldAsWikitty(extName, fieldName, false); - String url = contextPath + "/wikitty-json/search?extension=" + field.getAllowed(); + String url = ""; + if (field.hasAllowed()) { + url = contextPath + "/wikitty-json/search?extension=" + field.getAllowed(); + } else { + url = contextPath + "/wikitty-json/search?query="; + } /*{ <script> $(function() {

1 0

r164 - trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by ymartel＠users.chorem.org May 31, 2012

May 31, 2012

Author: ymartel Date: 2012-05-31 10:12:17 +0200 (Thu, 31 May 2012) New Revision: 164 Url: http://chorem.org/repositories/revision/chorem/164 Log: use a SELECT multiple for collection String with allowed Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-29 10:05:00 UTC (rev 163) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-31 08:12:17 UTC (rev 164) @@ -95,10 +95,10 @@ inputNumeric(output, contextPath, name, wikitty, field, extName, fieldName); break; case STRING: - if (field.isCollection()) { + if (field.hasAllowed()) { + inputSelectString(output, contextPath, name, wikitty, field, extName, fieldName); + } else if (field.isCollection()){ inputCollectionString(output, contextPath, name, wikitty, field, extName, fieldName); - } else if (field.hasAllowed()){ - inputSelectString(output, contextPath, name, wikitty, field, extName, fieldName); } else { inputString(output, contextPath, name, wikitty, field, extName, fieldName); } @@ -192,7 +192,11 @@ throws JspException, IOException { String id = wikitty.getId() + "-" + extName + "-" + fieldName; String value = wikitty.getFieldAsString(extName, fieldName); - /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> >}*/ + /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> }*/ + if (field.isCollection()) { + /*{ multiple="multiple" }*/ + } + /*{ >}*/ List<String> allowedValues = field.getAllowedAsList(); for (String allowedValue : allowedValues) { /*{<option value="<%=allowedValue%>"<%=getDynamicAttribute()%> ><%=allowedValue%></option>}*/

1 0

r163 - trunk/src/site
by ymartel＠users.chorem.org May 29, 2012

May 29, 2012

Author: ymartel Date: 2012-05-29 12:05:00 +0200 (Tue, 29 May 2012) New Revision: 163 Url: http://chorem.org/repositories/revision/chorem/163 Log: fix scm in footer Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-26 17:31:16 UTC (rev 162) +++ trunk/src/site/site_fr.xml 2012-05-29 10:05:00 UTC (rev 163) @@ -98,7 +98,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' @@ -109,4 +109,4 @@ </body> -</project> \ No newline at end of file +</project>

1 0

r162 - in trunk: chorem-entities/src/main/java/org/chorem chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org May 26, 2012

May 26, 2012

Author: bpoussin Date: 2012-05-26 19:31:16 +0200 (Sat, 26 May 2012) New Revision: 162 Url: http://chorem.org/repositories/revision/chorem/162 Log: creation de nouveau dashboard pour separer les infos entre project et financial (reduction de la taille du tableau) Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-05-26 17:31:16 UTC (rev 162) @@ -5,6 +5,8 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.entities.Attachment; +import org.chorem.entities.Configuration; +import org.chorem.entities.ConfigurationImpl; import org.chorem.entities.ContactDetails; import org.nuiton.util.ApplicationConfig; @@ -150,4 +152,27 @@ List<ContactDetails> contactDetails = result.getAll(); return contactDetails; } + + protected String configId; + public Configuration getConfiguration() { + if (configId == null) { + configId = findByQuery(new WikittyQueryMaker().exteq(Configuration.EXT_CONFIGURATION).end()); + } + + // on utilise le restore pour utilise le cache wikitty, il n'y a + // qu'une instance de cet objet + Configuration config = restore(Configuration.class, configId); + + if (config == null) { + // pas retrouve, on en cree un nouveau + // TODO poussin 20120524 dans le futur faire une interface pour recalculer/modifier les valeurs + config = new ConfigurationImpl(); + config.setDailyHoursWorked(6); + config.setDailyReturn(420); + store(config); + } + + return config; + } + } Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-26 17:31:16 UTC (rev 162) @@ -1,4 +1,4 @@ -org.chorem.entities.Configration.class.tagvalue.version=1.0 +org.chorem.entities.Configration.class.tagvalue.version=2.0 org.chorem.entities.Project.class.tagvalue.version=5.0 org.chorem.entities.Project.class.tagvalue.toString=%Project.name|noname$s org.chorem.entities.Project.class.tagvalue.sortOrder=Project.name @@ -54,7 +54,7 @@ org.chorem.entities.Evaluation.class.tagvalue.toString=%PersonSkill.evaluator$s %Evaluation.level|nolevel$s org.chorem.entities.Evaluation.class.tagvalue.sortOrder=Evaluation.level org.chorem.entities.Evaluation.class.tagvalue.preload=Evaluation.evaluator -org.chorem.entities.Vacation.class.tagvalue.version=7q.0 +org.chorem.entities.Vacation.class.tagvalue.version=8.0 org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.employee$s %Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s org.chorem.entities.Vacation.class.tagvalue.preload=Vacation.employee org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type @@ -65,7 +65,7 @@ org.chorem.entities.Touch.class.tagvalue.sortOrder=Interval.beginDate desc,Touch.type,Touch.goal org.chorem.entities.Touch.attribute.goal.tagvalue.subtype=text/rst org.chorem.entities.Touch.attribute.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch -org.chorem.entities.Attachment.class.tagvalue.version=5.0 +org.chorem.entities.Attachment.class.tagvalue.version=6.0 org.chorem.entities.Attachment.class.tagvalue.toString=%Attachment.name|noname$s (%Attachment.mimetype|notype$s) %Attachment.date$tF org.chorem.entities.Attachment.class.tagvalue.sortOrder=Attachment.name,Attachment.mimetype,Attachment.date org.chorem.entities.Quotation.class.tagvalue.version=9.0 Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-05-26 17:31:16 UTC (rev 162) @@ -1,19 +1,28 @@ package org.chorem.webmotion.actions; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Calendar; import java.util.Collection; +import java.util.Date; import java.util.EnumSet; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; import org.chorem.entities.Attachment; import org.chorem.entities.Configuration; import org.chorem.entities.ConfigurationImpl; +import org.chorem.entities.Employee; import org.chorem.entities.Invoice; import org.chorem.entities.Quotation; import org.chorem.entities.QuotationStatus; @@ -24,6 +33,8 @@ import org.chorem.entities.VacationStatus; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; +import org.nuiton.util.ObjectUtil; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryParser; @@ -42,6 +53,142 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(DashboardAction.class); + /** + * Permet de decore une map dont toutes les valeurs manquant lorsqu'on les + * demandent sont initialise avec l'objet passe dans le constructeur. + * L'objet initialise est pousse dans la map avant d'etre retourne. + * + * TODO poussin 20120526 move this class to nuiton-utils + * + * @param <K> + * @param <V> + */ + static public class MapWithDefault<K, V> implements Map<K, V> { + protected Map<K, V> map; + protected Object defaultValue; + protected Collection args; + + /** + * L'objet par default utilise est l'objet passe en parametre s'il n'est + * pas clonable ou un clone de l'objet s'il est clonable. + * @param map la map a decore + * @param defaultValue la valeur par default + */ + public MapWithDefault(Map<K, V> map, V defaultValue) { + this.map = map; + this.defaultValue = defaultValue; + } + + /** + * L'objet par defaut est construit via le constructeur de la classe + * passe en parametre prenant les arguments args. + * @param map la map a decore + * @param defaultValue la class de la valeur par defaut + * @param args les arguments du construteur pour la classe + */ + public MapWithDefault(Map<K, V> map, Class<V> defaultValue, Object... args) { + this.map = map; + this.defaultValue = defaultValue; + if (ArrayUtils.isNotEmpty(args)) { + this.args = Arrays.asList(args); + } + } + + /** + * Get new instance of defaultValue if defaultValue is clonable or + * return directly defaultValue otherwize. + * @return + */ + protected V getDefaultValue() { + try { + Object result = defaultValue; + if (defaultValue instanceof Class) { + if (args == null) { + result = ((Class)defaultValue).newInstance(); + } else { + result = ObjectUtil.newInstance(((Class)defaultValue), args, true); + } + } else if (defaultValue instanceof Cloneable) { + result = ObjectUtil.clone(((Cloneable)defaultValue)); + } + return (V)result; + } catch (Exception eee) { + throw new RuntimeException(eee); + } + } + + // on surcharge le get pour creer automatiquement les objets + @Override + public V get(Object key) { + V result = map.get(key); + if (result == null) { + result = getDefaultValue(); + put((K)key, result); + } + return result; + } + + public int size() { + return map.size(); + } + + public boolean isEmpty() { + return map.isEmpty(); + } + + public boolean containsKey(Object key) { + return map.containsKey(key); + } + + public boolean containsValue(Object value) { + return map.containsValue(value); + } + + public V put(K key, V value) { + return map.put(key, value); + } + + public V remove(Object key) { + return map.remove(key); + } + + public void putAll(Map<? extends K, ? extends V> m) { + map.putAll(m); + } + + public void clear() { + map.clear(); + } + + public Set<K> keySet() { + return map.keySet(); + } + + public Collection<V> values() { + return map.values(); + } + + public Set<Entry<K, V>> entrySet() { + return map.entrySet(); + } + } + + +// static public class TaskInfoMap extends HashMap<String, TaskInfo> { +// // on surcharge le get pour creer automatiquement les objets +// @Override +// public TaskInfo get(Object key) { +// TaskInfo result = super.get(key); +// if (result == null) { +// result = new TaskInfo(); +// result.id = (String)key; +// put(result.id, result); +// } +// return result; +// } +// }; + + protected <E> Map<String, List<Attachment>> prepareAttachment(ChoremClient client, Collection<E> ids) { // recherche des attachments de chaque quotation trouvee WikittyQuery attachmentQuery = new WikittyQueryMaker().and() @@ -67,6 +214,35 @@ return attachments; } + /** + * return le nombre de jour entre 2 dates. Les demi-journées doivent etre + * posée jusqu'à 12h00 + * + * @param v + * @return + */ + public double computeVacationDays(Vacation v) { + Date endDate = v.getEndDate(); + if (0 == DateUtils.getFragmentInSeconds(endDate, Calendar.DATE)) { + // on rajoute un jour pour que les vances du 01/01/2012 au 01/01/2012 + // represente bien un jour plein + endDate = DateUtils.addDays(endDate, 1); + } + long end = endDate.getTime(); + long begin = v.getBeginDate().getTime(); + + double result = (end - begin) / (1000.0 * 3600.0 * 24.0); + return result; + } + + public double computeWorkingDays(ChoremClient client, Time t) { + Configuration config = client.getConfiguration(); + long workingTime = t.getEndDate().getTime() - t.getBeginDate().getTime(); + double result = workingTime / (1000.0 * 3600.0 * config.getDailyHoursWorked()); // N heures de travail par jour + return result; + } + + //////////////////////////////////////////////////////////////////////////// // // C O N T A C T @@ -94,35 +270,16 @@ EnumSet<QuotationStatus> status, String jspRender, String title, boolean computeTask) { // recherche de la configuration pour les calcules - Configuration config = client.findByQuery(Configuration.class, - new WikittyQueryMaker().rTrue().end()); - if (config == null) { - // pas retrouve, on en cree un nouveau - // TODO poussin 20120524 dans le futur faire une interface pour recalculer/modifier les valeurs - config = new ConfigurationImpl(); - config.setDailyHoursWorked(6); - config.setDailyReturn(420); - client.store(config); - } + Configuration config = client.getConfiguration(); - // recuperation des quotations en fonction de leur status - // TODO poussin 20120525 lorsque wikitty supportera la methode parse sur - // WikittyQueryMaker l'utiliser au lieu de ce qui suit pour simplifier - // voir: http://www.nuiton.org/issues/2105 - WikittyQueryMaker quotationQueryMaker = new WikittyQueryMaker(); - - // si besoin on ajoute le filtre demande par l'utilisateur - if (StringUtils.isNotBlank(query)) { - WikittyQuery filter = WikittyQueryParser.parse(query); - quotationQueryMaker.and().condition(filter.getCondition()); - } - - WikittyQuery quotationQuery = quotationQueryMaker + WikittyQuery quotationQuery = new WikittyQueryMaker().and() + .parse(query) .containsOne(Quotation.FQ_FIELD_QUOTATION_STATUS, status) .end(); - WikittyQueryResult<Quotation> result = client.findAllByQuery(Quotation.class, quotationQuery); + WikittyQueryResult<Quotation> result = + client.findAllByQuery(Quotation.class, quotationQuery); // recherche des attachments de chaque quotation trouvee Map<String, List<Attachment>> attachments = @@ -132,7 +289,8 @@ // si besoin recherche le nombre de tache ouvert et ferme // key: quotation id - Map<String, TaskInfo> taskInfos = new TaskInfoMap(); + Map<String, TaskInfo> taskInfos = new MapWithDefault<String, TaskInfo>( + new HashMap<String, TaskInfo>(), TaskInfo.class); int opened = 0; int closed = 0; @@ -167,13 +325,11 @@ } } - long workingTime = 0; for (Time t : timeResult) { Task task = t.getTask(true); String id = task.getQuotation(); - workingTime += t.getEndDate().getTime() - t.getBeginDate().getTime(); TaskInfo info = taskInfos.get(id); - info.workingDays += workingTime / (1000 * 3600 * config.getDailyHoursWorked()); // N heures de travail par jour + info.workingDays += computeWorkingDays(client, t); } } @@ -230,9 +386,7 @@ return quotationFilter(client, query, status, jsp, title, true); } - static public class TaskInfo { - /** id de la quotation */ - public String id; + static public class TaskInfo implements Cloneable { /** nombre de tache ouverte (scheduled ou started) */ public int opened; /** nombre de tache ferme (finished ou closed) */ @@ -250,6 +404,11 @@ /** profit reel pour ce projet */ public double realProfit; + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + public int getOpened() { return opened; } @@ -316,20 +475,6 @@ } - static public class TaskInfoMap extends HashMap<String, TaskInfo> { - // on surcharge le get pour creer automatiquement les objets - @Override - public TaskInfo get(Object key) { - TaskInfo result = super.get(key); - if (result == null) { - result = new TaskInfo(); - result.id = (String)key; - put(result.id, result); - } - return result; - } - }; - //////////////////////////////////////////////////////////////////////////// // // F I N A N C I A L @@ -338,18 +483,8 @@ public Render invoice(ChoremClient client, String query) { // recuperation des factures - // TODO poussin 20120525 lorsque wikitty supportera la methode parse sur - // WikittyQueryMaker l'utiliser au lieu de ce qui suit pour simplifier - // voir: http://www.nuiton.org/issues/2105 - WikittyQueryMaker invoiceQueryMaker = new WikittyQueryMaker(); - - // si besoin on ajoute le filtre demande par l'utilisateur - if (StringUtils.isNotBlank(query)) { - WikittyQuery filter = WikittyQueryParser.parse(query); - invoiceQueryMaker.and().condition(filter.getCondition()); - } - - WikittyQuery invoiceQuery = invoiceQueryMaker + WikittyQuery invoiceQuery = new WikittyQueryMaker().and() + .parse(query) .exteq(Invoice.EXT_INVOICE) .end(); @@ -383,6 +518,13 @@ ); } + public Render profitability(ChoremClient client, String query) { + EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.STARTED, QuotationStatus.CLOSED); + String jsp = "dashboardProfitability.jsp"; + String title = "Profitability"; + return quotationFilter(client, query, status, jsp, title, true); + } + //////////////////////////////////////////////////////////////////////////// // // H R @@ -391,39 +533,93 @@ public Render vacationFilter(ChoremClient client, String query, String jspRender, EnumSet<VacationStatus> status) { // recuperation des vacances en fonction de leur status - // TODO poussin 20120525 lorsque wikitty supportera la methode parse sur - // WikittyQueryMaker l'utiliser au lieu de ce qui suit pour simplifier - // voir: http://www.nuiton.org/issues/2105 - WikittyQueryMaker vacationQueryMaker = new WikittyQueryMaker(); - - // si besoin on ajoute le filtre demande par l'utilisateur - if (StringUtils.isNotBlank(query)) { - WikittyQuery filter = WikittyQueryParser.parse(query); - vacationQueryMaker.and().condition(filter.getCondition()); - } - - WikittyQuery vacationQuery = vacationQueryMaker + WikittyQuery vacationQuery = new WikittyQueryMaker().and() + .parse(query) .containsOne(Vacation.FQ_FIELD_VACATION_STATUS, status) .end(); WikittyQueryResult<Vacation> vacations = client.findAllByQuery(Vacation.class, vacationQuery); + Map<String, Double> days = new HashMap<String, Double>(); + for (Vacation v : vacations) { + double d = computeVacationDays(v); + days.put(v.getWikittyId(), d); + } + return renderView(jspRender, - "vacations", vacations.getAll() + "vacations", vacations.getAll(), + "days", days ); } + /** + * Les vacances demandees par des employes non encore validee. + * @param client + * @param query + * @return + */ public Render vacationAsked(ChoremClient client, String query) { return vacationFilter(client, query, "dashboardVacationAsked.jsp", EnumSet.of(VacationStatus.ASKED)); } + /** + * Les vacances validees + * @param client + * @param query + * @return + */ public Render vacation(ChoremClient client, String query) { return vacationFilter(client, query, "dashboardVacation.jsp", EnumSet.of(VacationStatus.ACCEPTED)); } + public Render vacationByEmployee(ChoremClient client, String query) { + WikittyQuery vacationQuery = new WikittyQueryMaker().and() + .parse(query) + .eq(Vacation.FQ_FIELD_VACATION_STATUS, VacationStatus.ACCEPTED) + .end(); + WikittyQueryResult<Vacation> vacations = + client.findAllByQuery(Vacation.class, vacationQuery); + + Map<Employee, Double> days = new MapWithDefault<Employee, Double>( + new HashMap<Employee, Double>(), Double.valueOf(0)); + for(Vacation v : vacations) { + Employee e = v.getEmployee(false); + double d = days.get(e) + computeVacationDays(v); + days.put(e, d); + } + + return renderView("dashboardVacationByEmployee.jsp", + "vacationByEmployee", days + ); + } + /** + * Bilan du nombre de jour travaille sur des projets client depuis le 01/01 par employer de la + * societe par defaut (Configuration.defaultCompany) + */ + public Render workingProjectDaysByEmployee(ChoremClient client, String query) { + WikittyQuery vacationQuery = new WikittyQueryMaker().and() + .parse(query) + .exteq(Time.EXT_TIME) + .end(); + + WikittyQueryResult<Time> times = + client.findAllByQuery(Time.class, vacationQuery); + + Map<Employee, Double> days = new MapWithDefault<Employee, Double>( + new HashMap<Employee, Double>(), Double.valueOf(0)); + for(Time t : times) { + Employee e = t.getEmployee(false); + double d = days.get(e) + computeWorkingDays(client, t); + days.put(e, d); + } + + return renderView("dashboardWorkingProjectDaysByEmployee.jsp", + "workingProjectDaysByEmployee", days + ); + } } Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -0,0 +1,48 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<h1>${title}</h1> + +<table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Project</th> + <th>Type</th> + <th>Description</th> + <th>estimated days</th> + <th>Amount</th> + <th>working days</th> + <th>Hoped price day</th> + <th>Real price day</th> + <th>Hoped profit</th> + <th>Real profit</th> + <th>Status</th> + <th>Attchment</th> + </tr> + </thead> + <c:forEach var="q" items="${quotations}"> + <tbody> + <tr> + <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false).getName()}</a></td> + <td>${q.type}</td> + <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.description}</a></td> + <td>${q.estimatedDays}</td> + <td>${q.amount}</td> + <td>${taskInfos.get(q.wikittyId).workingDays}</td> + <td>${taskInfos.get(q.wikittyId).hopedPriceDay}</td> + <td>${taskInfos.get(q.wikittyId).realPriceDay}</td> + <td>${taskInfos.get(q.wikittyId).hopedProfit}</td> + <td>${taskInfos.get(q.wikittyId).realProfit}</td> + <td>${q.status}</td> + <td>${attachments.get(q.wikittyId)}</td> + </tr> + </tbody> + </c:forEach> +</table> + +<dl class="dl-horizontal"> + <dt>Total amount</dt><dd>${amount}</dd> + <dt>Total hoped profit</dt><dd>${hopedProfit}</dd> + <dt>Total real profit</dt><dd>${realProfit}</dd> + <dt>Profit discordance</dt><dd>${realProfit - hopedProfit}</dd> +</dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -15,10 +15,6 @@ <th>working days</th> <th>task opened</th> <th>task closed</th> - <th>Hoped price day</th> - <th>Real price day</th> - <th>Hoped profit</th> - <th>Real profit</th> <th>Amount</th> <th>Status</th> <th>Attchment</th> @@ -36,10 +32,6 @@ <td>${taskInfos.get(q.wikittyId).workingDays}</td> <td>${taskInfos.get(q.wikittyId).opened}</td> <td>${taskInfos.get(q.wikittyId).closed}</td> - <td>${taskInfos.get(q.wikittyId).hopedPriceDay}</td> - <td>${taskInfos.get(q.wikittyId).realPriceDay}</td> - <td>${taskInfos.get(q.wikittyId).hopedProfit}</td> - <td>${taskInfos.get(q.wikittyId).realProfit}</td> <td>${q.amount}</td> <td>${q.status}</td> <td>${attachments.get(q.wikittyId)}</td> @@ -51,9 +43,6 @@ <dl class="dl-horizontal"> <dt>Total amount</dt><dd>${amount}</dd> - <dt>Total hoped profit</dt><dd>${hopedProfit}</dd> - <dt>Total real profit</dt><dd>${realProfit}</dd> - <dt>Profit discordance</dt><dd>${realProfit - hopedProfit}</dd> <dt>Total task opened</dt><dd>${opened}</dd> <dt>Total task closed</dt><dd>${closed}</dd> </dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -11,6 +11,7 @@ <th>Employee</th> <th>Begin date</th> <th>End date</th> + <th>Days</th> <th>Type</th> <th>Description</th> </tr> @@ -21,6 +22,7 @@ <td><a href="<c:url value="/wikitty/Employee/view/${q.employee}"/>">${q.getEmployee(false)}</a></td> <td><a href="<c:url value="/wikitty/Vacation/view/${q.wikittyId}"/>">${q.beginDate}</a></td> <td>${q.endDate}</td> + <td>${days.get(q.wikittyId)}</td> <td>${q.type}</td> <td>${q.description}</td> </tr> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -9,6 +9,7 @@ <th>Employee</th> <th>Begin date</th> <th>End date</th> + <th>Days</th> <th>Type</th> <th>Description</th> </tr> @@ -19,6 +20,7 @@ <td><a href="<c:url value="/wikitty/Employee/view/${q.employee}"/>">${q.getEmployee(false)}</a></td> <td><a href="<c:url value="/wikitty/Vacation/view/${q.wikittyId}"/>">${q.beginDate}</a></td> <td>${q.endDate}</td> + <td>${days.get(q.wikittyId)}</td> <td>${q.type}</td> <td>${q.description}</td> </tr> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -0,0 +1,12 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<h1>Vacances par employe</h1> + +<ul> + <c:forEach var="q" items="${vacationByEmployee.keySet()}"> + + <li><strong>${q}:</strong> <span>${vacationByEmployee.get(q)}</span></li> + + </c:forEach> +</ul> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<h1>Jour de travail sur des projets client par employe</h1> + +<ul> + <c:forEach var="q" items="${workingProjectDaysByEmployee.keySet()}"> + <li><strong>${q}:</strong> <span>${workingProjectDaysByEmployee.get(q)}</span></li> + </c:forEach> +</ul> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -8,3 +8,4 @@ </form> <jsp:include page="/fragment/dashboard/invoice?query=${query}"/> +<jsp:include page="/fragment/dashboard/profitability?query=${query}"/> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-25 16:22:13 UTC (rev 161) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-26 17:31:16 UTC (rev 162) @@ -9,3 +9,5 @@ <jsp:include page="/fragment/dashboard/vacationAsked?query=${query}"/> <jsp:include page="/fragment/dashboard/vacation?query=${query}"/> +<jsp:include page="/fragment/dashboard/vacationByEmployee?query=${query}"/> +<jsp:include page="/fragment/dashboard/workingProjectDaysByEmployee?query=${query}"/>

1 0

r161 - trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by ymartel＠users.chorem.org May 25, 2012

May 25, 2012

Author: ymartel Date: 2012-05-25 18:22:13 +0200 (Fri, 25 May 2012) New Revision: 161 Url: http://chorem.org/repositories/revision/chorem/161 Log: Use a select box for String Field with allowed Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-25 15:52:19 UTC (rev 160) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-05-25 16:22:13 UTC (rev 161) @@ -1,18 +1,6 @@ package org.wikitty.web.jsptag; -import java.io.IOException; -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.SimpleTagSupport; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -22,6 +10,19 @@ import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; +import javax.servlet.ServletContext; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.DynamicAttributes; +import javax.servlet.jsp.tagext.SimpleTagSupport; +import java.io.IOException; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * * @author poussin @@ -96,6 +97,8 @@ case STRING: if (field.isCollection()) { inputCollectionString(output, contextPath, name, wikitty, field, extName, fieldName); + } else if (field.hasAllowed()){ + inputSelectString(output, contextPath, name, wikitty, field, extName, fieldName); } else { inputString(output, contextPath, name, wikitty, field, extName, fieldName); } @@ -162,7 +165,8 @@ Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { String id = wikitty.getId() + "-" + extName + "-" + fieldName; - String value = wikitty.getFieldAsString(extName, fieldName); + String fieldValue = wikitty.getFieldAsString(extName, fieldName); + String value = fieldValue !=null ? fieldValue : ""; if ("monoline".equalsIgnoreCase(field.getSubtype())) { /*{<input id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%>/>}*/ if (field.hasChoiceQuery()) { @@ -183,6 +187,19 @@ } } + protected void inputSelectString(JspWriter output, String contextPath, String name, + Wikitty wikitty, FieldType field, String extName , String fieldName) + throws JspException, IOException { + String id = wikitty.getId() + "-" + extName + "-" + fieldName; + String value = wikitty.getFieldAsString(extName, fieldName); + /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> >}*/ + List<String> allowedValues = field.getAllowedAsList(); + for (String allowedValue : allowedValues) { + /*{<option value="<%=allowedValue%>"<%=getDynamicAttribute()%> ><%=allowedValue%></option>}*/ + } + /*{</select>}*/ + } + protected void inputCollectionString(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException {

1 0

r160 - trunk/chorem-entities/src/main/xmi
by bpoussin＠users.chorem.org May 25, 2012

May 25, 2012

Author: bpoussin Date: 2012-05-25 17:52:19 +0200 (Fri, 25 May 2012) New Revision: 160 Url: http://chorem.org/repositories/revision/chorem/160 Log: - ajout d'un champs Configuration.defaultCompany (pour savoir qu'elle company utilise le logiciel) - ajout d'un champs Attachment.contentUrl (si le document est stocker a l'exterieur) Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ)

1 0

r159 - trunk/chorem-entities/src/main/xmi
by ymartel＠users.chorem.org May 25, 2012

May 25, 2012

Author: ymartel Date: 2012-05-25 15:57:47 +0200 (Fri, 25 May 2012) New Revision: 159 Url: http://chorem.org/repositories/revision/chorem/159 Log: fixes #555 change some wikitty.toString tagvalues Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-25 10:40:37 UTC (rev 158) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-25 13:57:47 UTC (rev 159) @@ -2,13 +2,15 @@ org.chorem.entities.Project.class.tagvalue.version=5.0 org.chorem.entities.Project.class.tagvalue.toString=%Project.name|noname$s org.chorem.entities.Project.class.tagvalue.sortOrder=Project.name -org.chorem.entities.Task.class.tagvalue.version=7.0 -org.chorem.entities.Task.class.tagvalue.toString=%Task.name|noname$s +org.chorem.entities.Task.class.tagvalue.version=8.0 +org.chorem.entities.Task.class.tagvalue.toString=%Task.name|noname$s - %Task.quotation$s org.chorem.entities.Task.class.tagvalue.sortOrder=Task.name +org.chorem.entities.Task.class.tagvalue.preload=Task.quotation org.chorem.entities.Task.attribute.status.tagvalue.allowed=SCHEDULED,STARTED,FINISHED,CLOSED -org.chorem.entities.Worker.class.tagvalue.version=5.0 -org.chorem.entities.Worker.class.tagvalue.toString=%Worker.percentage|nopercentage$s +org.chorem.entities.Worker.class.tagvalue.version=6.0 +org.chorem.entities.Worker.class.tagvalue.toString=%Worker.person$s - %Worker.task$s - %Worker.percentage|nopercentage$s org.chorem.entities.Worker.class.tagvalue.sortOrder=Worker.percentage +org.chorem.entities.Worker.class.tagvalue.preload=Worker.person;Work.task org.chorem.entities.Person.class.tagvalue.version=5.0 org.chorem.entities.Person.class.tagvalue.toString=%Person.lastName$s %Person.firstName|noname$s org.chorem.entities.Person.class.tagvalue.sortOrder=Person.lastName,Person.firstName @@ -23,33 +25,38 @@ org.chorem.entities.ContactDetails.class.tagvalue.version=5.0 org.chorem.entities.ContactDetails.class.tagvalue.toString=%ContactDetails.type|notype$s %ContactDetails.name|noname$s %ContactDetails.value$s org.chorem.entities.ContactDetails.class.tagvalue.sortOrder=ContactDetails.type, ContactDetails.name,ContactDetails.value -org.chorem.entities.Time.class.tagvalue.version=6.0 +org.chorem.entities.Time.class.tagvalue.version=7.0 org.chorem.entities.Time.class.tagvalue.preload=Time.task;Time.employee -org.chorem.entities.Employee.class.tagvalue.version=5.0 +org.chorem.entities.Time.class.tagvalue.toString=%Time.employee$s - %Time.task$s - %Interval.beginDate$tF-%Interval.endDate$tF +org.chorem.entities.Employee.class.tagvalue.version=6.0 org.chorem.entities.Employee.class.tagvalue.preload=Employee.company;Employee.person -org.chorem.entities.Employee.class.tagvalue.toString=%Employee.company$s %Employee.person$s %Employee.type|notype$s +org.chorem.entities.Employee.class.tagvalue.toString=%Employee.company$s %Employee.person$s org.chorem.entities.Employee.class.tagvalue.sortOrder=Employee.company,Employee.person org.chorem.entities.Goal.class.tagvalue.version=5.0 org.chorem.entities.Goal.class.tagvalue.toString=%Goal.name|noname$s org.chorem.entities.Goal.class.tagvalue.sortOrder=Goal.name -org.chorem.entities.PersonSkill.class.tagvalue.version=5.0 -org.chorem.entities.PersonSkill.class.tagvalue.toString=%Evaluation.level|nolevel$s +org.chorem.entities.PersonSkill.class.tagvalue.version=6.0 +org.chorem.entities.PersonSkill.class.tagvalue.toString=%PersonSkill.person$s %Evaluation.level|nolevel$s org.chorem.entities.PersonSkill.class.tagvalue.sortOrder=Evaluation.level -org.chorem.entities.Skill.class.tagvalue.version=5.0 -org.chorem.entities.Skill.class.tagvalue.toString=%Skill.description|nodescription$s +org.chorem.entities.PersonSkill.class.tagvalue.preload=PersonSkill.person +org.chorem.entities.Skill.class.tagvalue.version=6.0 +org.chorem.entities.Skill.class.tagvalue.toString=%WikittyTreeNode$s %Skill.description|nodescription$s org.chorem.entities.Skill.class.tagvalue.sortOrder=Skill.description -org.chorem.entities.Interview.class.tagvalue.version=5.0 -org.chorem.entities.Interview.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Interview.type|notype$s +org.chorem.entities.Interview.class.tagvalue.version=6.0 +org.chorem.entities.Interview.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Interview.type|notype$s %Interview.interviewee$s org.chorem.entities.Interview.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Interview.type -org.chorem.entities.Mission.class.tagvalue.version=5.0 -org.chorem.entities.Mission.class.tagvalue.toString=%Mission.name|noname$s (%Mission.role$s) +org.chorem.entities.Interview.class.tagvalue.preload=Interval.interviewee +org.chorem.entities.Mission.class.tagvalue.version=6.0 +org.chorem.entities.Mission.class.tagvalue.toString=%Mission.name|noname$s %Mission.employee$s (%Mission.role$s) org.chorem.entities.Mission.class.tagvalue.sortOrder=Mission.name,Mission.role -org.chorem.entities.Evaluation.class.tagvalue.version=5.0 -org.chorem.entities.Evaluation.class.tagvalue.toString=%Evaluation.level|nolevel$s +org.chorem.entities.Mission.class.tagvalue.preload=Mission.employee +org.chorem.entities.Evaluation.class.tagvalue.version=6.0 +org.chorem.entities.Evaluation.class.tagvalue.toString=%PersonSkill.evaluator$s %Evaluation.level|nolevel$s org.chorem.entities.Evaluation.class.tagvalue.sortOrder=Evaluation.level -org.chorem.entities.Vacation.class.tagvalue.version=6.0 +org.chorem.entities.Evaluation.class.tagvalue.preload=Evaluation.evaluator +org.chorem.entities.Vacation.class.tagvalue.version=7q.0 +org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.employee$s %Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s org.chorem.entities.Vacation.class.tagvalue.preload=Vacation.employee -org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type org.chorem.entities.Vacation.attribute.status.tagvalue.allowed=DRAFT,ASKED,REJECTED,ACCEPTED org.chorem.entities.Touch.class.tagvalue.version=6.0

1 0

r158 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org May 25, 2012

May 25, 2012

Author: bpoussin Date: 2012-05-25 12:40:37 +0200 (Fri, 25 May 2012) New Revision: 158 Url: http://chorem.org/repositories/revision/chorem/158 Log: - mise en place des dashboard sur les menus Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-05-25 10:35:08 UTC (rev 157) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-05-25 10:40:37 UTC (rev 158) @@ -66,7 +66,7 @@ </li> <li class="dropdown nav-group">  - <a href="<c:url value="/wikitty/search?extension=Quotation&extension=ProjectOrder&extension=Task"/>">Project</a> + <a href="<c:url value="/project"/>">Project</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> <b class="caret"></b> </a> @@ -94,7 +94,7 @@ </li> <li class="dropdown nav-group">  - <a href="<c:url value="/wikitty/search?extension=Invoice&extension=Quotation&extension=Invoiceable"/>">Financial</a> + <a href="<c:url value="/financial"/>">Financial</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> <b class="caret"></b> </a> @@ -119,6 +119,10 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> + <li>Vacation</li> + <li><a href="<c:url value="/wikitty/Vacation/search"/>"><i class="icon-th-list icon-black"></i> All vacations</a></li> + <li><a href="<c:url value="/wikitty/Vacation/edit/new"/>"><i class="icon-plus icon-black"></i> Add vacation</a></li> + <li class="divider"></li> <li><a href="/wikitty/search?query=extension=Employee">Employee</a></li> <li><a href="/wikitty/search?query=extension=Interview">Annual interview</a></li> </ul> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-25 10:35:08 UTC (rev 157) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-25 10:40:37 UTC (rev 158) @@ -7,4 +7,4 @@ <input type="submit"/> </form> -<jsp:include page="/fragment/dashboard/invoice"/> +<jsp:include page="/fragment/dashboard/invoice?query=${query}"/> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-25 10:35:08 UTC (rev 157) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-25 10:40:37 UTC (rev 158) @@ -7,5 +7,5 @@ <input type="submit"/> </form> -<jsp:include page="/fragment/dashboard/vacationAsked"/> -<jsp:include page="/fragment/dashboard/vacation"/> +<jsp:include page="/fragment/dashboard/vacationAsked?query=${query}"/> +<jsp:include page="/fragment/dashboard/vacation?query=${query}"/>

1 0

r157 - in trunk: chorem-entities/src/main/java/org/chorem/entities chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/resources chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org May 25, 2012

May 25, 2012

Author: bpoussin Date: 2012-05-25 12:35:08 +0200 (Fri, 25 May 2012) New Revision: 157 Url: http://chorem.org/repositories/revision/chorem/157 Log: - ajout dashboard invoice - ajout dashboard vacation - ajout zone de filtre sur les dashbords - modif modele (enum vacation, interval subtime is datetime) Added: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/project.jsp Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp Added: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java (rev 0) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,18 @@ +package org.chorem.entities; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public enum VacationStatus { + + DRAFT, // cours de reflexion par l'employe + ASKED, // conge demande, doit etre accepte par un superieur + REJECTED, // conge refuse + ACCEPTED // conge accepte + +} Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-25 10:01:43 UTC (rev 156) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-25 10:35:08 UTC (rev 157) @@ -12,9 +12,11 @@ org.chorem.entities.Person.class.tagvalue.version=5.0 org.chorem.entities.Person.class.tagvalue.toString=%Person.lastName$s %Person.firstName|noname$s org.chorem.entities.Person.class.tagvalue.sortOrder=Person.lastName,Person.firstName -org.chorem.entities.Interval.class.tagvalue.version=5.0 +org.chorem.entities.Interval.class.tagvalue.version=6.0 org.chorem.entities.Interval.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF org.chorem.entities.Interval.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate +org.chorem.entities.Interval.attribute.beginDate.tagvalue.subtime=datetime +org.chorem.entities.Interval.attribute.endDate.tagvalue.subtime=datetime org.chorem.entities.Company.class.tagvalue.version=5.0 org.chorem.entities.Company.class.tagvalue.toString=%Company.name|noname$s org.chorem.entities.Company.class.tagvalue.sortOrder=Company.name @@ -45,9 +47,11 @@ org.chorem.entities.Evaluation.class.tagvalue.version=5.0 org.chorem.entities.Evaluation.class.tagvalue.toString=%Evaluation.level|nolevel$s org.chorem.entities.Evaluation.class.tagvalue.sortOrder=Evaluation.level -org.chorem.entities.Vacation.class.tagvalue.version=5.0 +org.chorem.entities.Vacation.class.tagvalue.version=6.0 +org.chorem.entities.Vacation.class.tagvalue.preload=Vacation.employee org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type +org.chorem.entities.Vacation.attribute.status.tagvalue.allowed=DRAFT,ASKED,REJECTED,ACCEPTED org.chorem.entities.Touch.class.tagvalue.version=6.0 org.chorem.entities.Touch.class.tagvalue.preload=Touch.participant org.chorem.entities.Touch.class.tagvalue.toString=%Interval.beginDate$tF - %Touch.type$s - %Touch.goal|nogoal$s @@ -57,14 +61,18 @@ org.chorem.entities.Attachment.class.tagvalue.version=5.0 org.chorem.entities.Attachment.class.tagvalue.toString=%Attachment.name|noname$s (%Attachment.mimetype|notype$s) %Attachment.date$tF org.chorem.entities.Attachment.class.tagvalue.sortOrder=Attachment.name,Attachment.mimetype,Attachment.date -org.chorem.entities.Quotation.class.tagvalue.version=8.0 +org.chorem.entities.Quotation.class.tagvalue.version=9.0 org.chorem.entities.Quotation.class.tagvalue.preload=Quotation.project;Quotation.customer;Quotation.supplier org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.type|notype$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=DRAFT,SEND,REJECTED,ACCEPTED,STARTED,DELIVERED,VRS,WARRANTY,CLOSED -org.chorem.entities.Invoice.class.tagvalue.version=5.0 +org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 +org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 +org.chorem.entities.Invoice.class.tagvalue.version=6.0 +org.chorem.entities.Invoice.class.tagvalue.preload=Invoice.target org.chorem.entities.Invoice.class.tagvalue.toString=%Invoice.reference|noref$s %Invoice.amount|noamount$s %Invoice.postedDate$tF %Invoice.expectedDate$tF %Invoice.paymentDate$tF org.chorem.entities.Invoice.class.tagvalue.sortOrder=Invoice.postedDate,Invoice.expectedDate,Invoice.paymentDate,Invoice.reference,Invoice.amount -org.chorem.entities.Invoiceable.class.tagvalue.version=5.0 +org.chorem.entities.Invoiceable.class.tagvalue.version=6.0 +org.chorem.entities.Invoiceable.class.tagvalue.preload=Invoiceable.customer;Invoiceable.supplier org.chorem.entities.Invoiceable.class.tagvalue.toString=%Invoiceable.name|noname$s org.chorem.entities.Invoiceable.class.tagvalue.sortOrder=Invoiceable.name Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-05-25 10:01:43 UTC (rev 156) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-05-25 10:35:08 UTC (rev 157) @@ -1,26 +1,32 @@ package org.chorem.webmotion.actions; +import java.util.Collection; import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; import org.chorem.entities.Attachment; import org.chorem.entities.Configuration; import org.chorem.entities.ConfigurationImpl; +import org.chorem.entities.Invoice; import org.chorem.entities.Quotation; import org.chorem.entities.QuotationStatus; import org.chorem.entities.Task; import org.chorem.entities.TaskStatus; import org.chorem.entities.Time; +import org.chorem.entities.Vacation; +import org.chorem.entities.VacationStatus; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; /** @@ -36,7 +42,55 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(DashboardAction.class); - protected Render quotationFilter(ChoremClient client, + protected <E> Map<String, List<Attachment>> prepareAttachment(ChoremClient client, Collection<E> ids) { + // recherche des attachments de chaque quotation trouvee + WikittyQuery attachmentQuery = new WikittyQueryMaker().and() + .exteq(Attachment.EXT_ATTACHMENT) + .containsOne(Attachment.FQ_FIELD_ATTACHMENT_TARGET, ids) + .end(); + + WikittyQueryResult<Attachment> attachmentResult = + client.findAllByQuery(Attachment.class, attachmentQuery); + + // preparation des attachements pour chaque quotation + Map<String, List<Attachment>> attachments = new HashMap<String, List<Attachment>>(); + for (Attachment a : attachmentResult) { + String id = a.getTarget(); + List<Attachment> l = attachments.get(id); + if (l == null) { + l = new LinkedList<Attachment>(); + attachments.put(id, l); + } + l.add(a); + } + + return attachments; + } + + //////////////////////////////////////////////////////////////////////////// + // + // C O N T A C T + // + //////////////////////////////////////////////////////////////////////////// + + //////////////////////////////////////////////////////////////////////////// + // + // P R O J E C T + // + //////////////////////////////////////////////////////////////////////////// + + /** + * + * @param client wikitty client injected by wm + * @param query query to filter projet (can be null) + * @param status status required by quotation to appear + * @param jspRender jsp used to render result + * @param title title of jsp page + * @param computeTask true if we want to compute task info + * (task info not needed for not stated project) + * @return + */ + protected Render quotationFilter(ChoremClient client, String query, EnumSet<QuotationStatus> status, String jspRender, String title, boolean computeTask) { // recherche de la configuration pour les calcules @@ -53,32 +107,27 @@ // recuperation des quotations en fonction de leur status - WikittyQuery query = new WikittyQueryMaker() + // TODO poussin 20120525 lorsque wikitty supportera la methode parse sur + // WikittyQueryMaker l'utiliser au lieu de ce qui suit pour simplifier + // voir: http://www.nuiton.org/issues/2105 + WikittyQueryMaker quotationQueryMaker = new WikittyQueryMaker(); + + // si besoin on ajoute le filtre demande par l'utilisateur + if (StringUtils.isNotBlank(query)) { + WikittyQuery filter = WikittyQueryParser.parse(query); + quotationQueryMaker.and().condition(filter.getCondition()); + } + + WikittyQuery quotationQuery = quotationQueryMaker .containsOne(Quotation.FQ_FIELD_QUOTATION_STATUS, status) .end(); - WikittyQueryResult<Quotation> result = client.findAllByQuery(Quotation.class, query); + WikittyQueryResult<Quotation> result = client.findAllByQuery(Quotation.class, quotationQuery); + // recherche des attachments de chaque quotation trouvee - WikittyQuery attachmentQuery = new WikittyQueryMaker().and() - .exteq(Attachment.EXT_ATTACHMENT) - .containsOne(Attachment.FQ_FIELD_ATTACHMENT_TARGET, result.getAll()) - .end(); + Map<String, List<Attachment>> attachments = + prepareAttachment(client, result.getAll()); - WikittyQueryResult<Attachment> attachmentResult = - client.findAllByQuery(Attachment.class, attachmentQuery); - - // preparation des attachements pour chaque quotation - Map<String, List<Attachment>> attachments = new HashMap<String, List<Attachment>>(); - for (Attachment a : attachmentResult) { - String id = a.getTarget(); - List<Attachment> l = attachments.get(id); - if (l == null) { - l = new LinkedList<Attachment>(); - attachments.put(id, l); - } - l.add(a); - } - // TODO poussin 20120523 ajouer la recherche des note sur la quotation // si besoin recherche le nombre de tache ouvert et ferme @@ -160,25 +209,25 @@ "taskInfos", taskInfos); } - public Render quotation(ChoremClient client) { + public Render quotation(ChoremClient client, String query) { EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.DRAFT, QuotationStatus.SEND); String jsp = "dashboardQuotation.jsp"; String title = "Les propositions en attente de réponse"; - return quotationFilter(client, status, jsp, title, false); + return quotationFilter(client, query, status, jsp, title, false); } - public Render projectOpen(ChoremClient client) { + public Render projectOpen(ChoremClient client, String query) { EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.ACCEPTED, QuotationStatus.VRS); String jsp = "dashboardProject.jsp"; String title = "Les projets en cours"; - return quotationFilter(client, status, jsp, title, true); + return quotationFilter(client, query, status, jsp, title, true); } - public Render projectClosed(ChoremClient client) { + public Render projectClosed(ChoremClient client, String query) { EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.WARRANTY, QuotationStatus.CLOSED); String jsp = "dashboardProject.jsp"; String title = "Les projets clos"; - return quotationFilter(client, status, jsp, title, true); + return quotationFilter(client, query, status, jsp, title, true); } static public class TaskInfo { @@ -280,4 +329,101 @@ return result; } }; + + //////////////////////////////////////////////////////////////////////////// + // + // F I N A N C I A L + // + //////////////////////////////////////////////////////////////////////////// + + public Render invoice(ChoremClient client, String query) { + // recuperation des factures + // TODO poussin 20120525 lorsque wikitty supportera la methode parse sur + // WikittyQueryMaker l'utiliser au lieu de ce qui suit pour simplifier + // voir: http://www.nuiton.org/issues/2105 + WikittyQueryMaker invoiceQueryMaker = new WikittyQueryMaker(); + + // si besoin on ajoute le filtre demande par l'utilisateur + if (StringUtils.isNotBlank(query)) { + WikittyQuery filter = WikittyQueryParser.parse(query); + invoiceQueryMaker.and().condition(filter.getCondition()); + } + + WikittyQuery invoiceQuery = invoiceQueryMaker + .exteq(Invoice.EXT_INVOICE) + .end(); + + WikittyQueryResult<Invoice> invoices = + client.findAllByQuery(Invoice.class, invoiceQuery); + + double amount = 0; + double amountPaid = 0; + double amountExpected = 0; + // calcul des amounts + for (Invoice i : invoices) { + double v = i.getAmount(); + amount += v; + if (i.getPaymentDate() == null) { + amountExpected += v; + } else { + amountPaid += v; + } + } + + // recherche des attachments de chaque quotation trouvee + Map<String, List<Attachment>> attachments = + prepareAttachment(client, invoices.getAll()); + + return renderView("dashboardInvoice.jsp", + "invoices", invoices.getAll(), + "amount", amount, + "amountPaid", amountPaid, + "amountExpected", amountExpected, + "attachments", attachments + ); + } + + //////////////////////////////////////////////////////////////////////////// + // + // H R + // + //////////////////////////////////////////////////////////////////////////// + + public Render vacationFilter(ChoremClient client, String query, String jspRender, EnumSet<VacationStatus> status) { + // recuperation des vacances en fonction de leur status + // TODO poussin 20120525 lorsque wikitty supportera la methode parse sur + // WikittyQueryMaker l'utiliser au lieu de ce qui suit pour simplifier + // voir: http://www.nuiton.org/issues/2105 + WikittyQueryMaker vacationQueryMaker = new WikittyQueryMaker(); + + // si besoin on ajoute le filtre demande par l'utilisateur + if (StringUtils.isNotBlank(query)) { + WikittyQuery filter = WikittyQueryParser.parse(query); + vacationQueryMaker.and().condition(filter.getCondition()); + } + + WikittyQuery vacationQuery = vacationQueryMaker + .containsOne(Vacation.FQ_FIELD_VACATION_STATUS, status) + .end(); + + WikittyQueryResult<Vacation> vacations = + client.findAllByQuery(Vacation.class, vacationQuery); + + return renderView(jspRender, + "vacations", vacations.getAll() + ); + + } + + public Render vacationAsked(ChoremClient client, String query) { + return vacationFilter(client, query, "dashboardVacationAsked.jsp", + EnumSet.of(VacationStatus.ASKED)); + } + + public Render vacation(ChoremClient client, String query) { + return vacationFilter(client, query, "dashboardVacation.jsp", + EnumSet.of(VacationStatus.ACCEPTED)); + } + + } Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2012-05-25 10:01:43 UTC (rev 156) +++ trunk/chorem-webmotion/src/main/resources/mapping 2012-05-25 10:35:08 UTC (rev 157) @@ -28,3 +28,6 @@ * /wikitty-json/get/{id} action:GenericAction.getById * /fragment/dashboard/{method} action:DashboardAction.{method} * /contact view:contact.jsp +* /project view:project.jsp +* /financial view:financial.jsp +* /hr view:hr.jsp Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,45 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<h1>Invoices</h1> + +<table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Project/Task</th> + <th>Reference</th> + <th>Description</th> + <th>Customer</th> + <th>Supplier</th> + <th>Amount</th> + <th>Posted date</th> + <th>Expected date</th> + <th>Payment date</th> + <th>Attchment</th> + </tr> + </thead> + <c:forEach var="q" items="${invoices}"> + <tbody> + <tr> + <td><a href="<c:url value="/wikitty/view/${q.target}"/>">${q.getTarget()}</a></td> + <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.reference}</a></td> + <td>${q.description}</td> + <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> + <td><a href="<c:url value="/wikitty/Employee/view/${q.supplier}"/>">${q.getSupplier(false)}</a></td> + <td>${q.amount}</td> + <td>${q.postedDate}</td> + <td>${q.expectedDate}</td> + <td>${q.paymentDate}</td> + <td>${attachments.get(q.wikittyId)}</td> + </tr> + </tbody> + </c:forEach> +</table> + + +<dl class="dl-horizontal"> + <dt>Total</dt><dd>${amount}</dd> + <dt>Total paid</dt><dd>${amountPaid}</dd> + <dt>Total expected</dt><dd>${amountExpected}</dd> +</dl> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-05-25 10:01:43 UTC (rev 156) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -11,8 +11,8 @@ <th>Description</th> <th>Customer</th> <th>Supplier</th> - <th>estimatedDays</th> - <th>workingDays</th> + <th>estimated days</th> + <th>working days</th> <th>task opened</th> <th>task closed</th> <th>Hoped price day</th> @@ -42,7 +42,7 @@ <td>${taskInfos.get(q.wikittyId).realProfit}</td> <td>${q.amount}</td> <td>${q.status}</td> - <td>${attachment.get(q.wikittyId)}</td> + <td>${attachments.get(q.wikittyId)}</td> </tr> </tbody> </c:forEach> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-05-25 10:01:43 UTC (rev 156) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -11,9 +11,9 @@ <th>Description</th> <th>Customer</th> <th>Supplier</th> - <th>estimatedDays</th> - <th>convsersionHope</th> - <th>Price days Hope</th> + <th>estimated days</th> + <th>convsersion hope</th> + <th>hoped price day</th> <th>Amount</th> <th>Status</th> <th>Attchment</th> @@ -32,7 +32,7 @@ <td>${q.amount / q.estimatedDays}</td> <td>${q.amount}</td> <td>${q.status}</td> - <td>${attachment.get(q.wikittyId)}</td> + <td>${attachments.get(q.wikittyId)}</td> </tr> </tbody> </c:forEach> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,29 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<h1>Vacances</h1> + +<%-- TODO poussin 20120525 remplacer le tableau par une frise chronologique --%> + +<table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Employee</th> + <th>Begin date</th> + <th>End date</th> + <th>Type</th> + <th>Description</th> + </tr> + </thead> + <c:forEach var="q" items="${vacations}"> + <tbody> + <tr> + <td><a href="<c:url value="/wikitty/Employee/view/${q.employee}"/>">${q.getEmployee(false)}</a></td> + <td><a href="<c:url value="/wikitty/Vacation/view/${q.wikittyId}"/>">${q.beginDate}</a></td> + <td>${q.endDate}</td> + <td>${q.type}</td> + <td>${q.description}</td> + </tr> + </tbody> + </c:forEach> +</table> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,27 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<h1>Vacances en attente d'agrément</h1> + +<table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Employee</th> + <th>Begin date</th> + <th>End date</th> + <th>Type</th> + <th>Description</th> + </tr> + </thead> + <c:forEach var="q" items="${vacations}"> + <tbody> + <tr> + <td><a href="<c:url value="/wikitty/Employee/view/${q.employee}"/>">${q.getEmployee(false)}</a></td> + <td><a href="<c:url value="/wikitty/Vacation/view/${q.wikittyId}"/>">${q.beginDate}</a></td> + <td>${q.endDate}</td> + <td>${q.type}</td> + <td>${q.description}</td> + </tr> + </tbody> + </c:forEach> +</table> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +<h1>HR</h1> + +<form> + <input type="text" name="query"/> + <input type="submit"/> +</form> + +<jsp:include page="/fragment/dashboard/invoice"/> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,11 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +<h1>HR</h1> + +<form> + <input type="text" name="query"/> + <input type="submit"/> +</form> + +<jsp:include page="/fragment/dashboard/vacationAsked"/> +<jsp:include page="/fragment/dashboard/vacation"/> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp 2012-05-25 10:01:43 UTC (rev 156) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -3,7 +3,3 @@ <h1>Chorem</h1> Bienvenue sur Chorem, l'outil de gestion d'entreprise. - -<jsp:include page="/fragment/dashboard/quotation"/> -<jsp:include page="/fragment/dashboard/projectOpen"/> -<jsp:include page="/fragment/dashboard/projectClosed"/> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/project.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/project.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/project.jsp 2012-05-25 10:35:08 UTC (rev 157) @@ -0,0 +1,12 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +<h1>Project</h1> + +<form> + <input type="text" name="query"/> + <input type="submit"/> +</form> + +<jsp:include page="/fragment/dashboard/quotation?query=${query}"/> +<jsp:include page="/fragment/dashboard/projectOpen?query=${query}"/> +<jsp:include page="/fragment/dashboard/projectClosed?query=${query}"/>

1 0