diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod index 4bdee59f79a0d7ca91293f99c44eb094b05b6259..688c47bd92b6ccc8b484fc935c556c5619006e8c 100644 --- a/entity/Timetracking_entity/Timetracking_entity.aod +++ b/entity/Timetracking_entity/Timetracking_entity.aod @@ -15,8 +15,9 @@ </entityField> <entityField> <name>MINUTES</name> - <title>Minutes</title> + <title>Time</title> <mandatory v="true" /> + <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess> </entityField> <entityField> <name>OBJECT_ID</name> diff --git a/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js b/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..326c2a9f306a8a9356e4f895c630ace18a27a91f --- /dev/null +++ b/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js @@ -0,0 +1,5 @@ +import("system.vars"); +import("system.result"); +import("Timetracking_lib"); + +result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.MINUTES")))); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 7b3e2ab6138984a1302898521d9b51806d25396d..8caf6fac2ab14bb213f36e8f62b22eb30574d62f 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -2364,6 +2364,15 @@ <entry> <key>Touchpoint</key> </entry> + <entry> + <key>Combobox Value</key> + </entry> + <entry> + <key>relations</key> + </entry> + <entry> + <key>Time</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 8c68c088ff01651d9834eb2738ee6efaa5cb1852..0969f6e7d8cc4b87a87542cd85f3a584e99622a8 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -2734,6 +2734,13 @@ <key>Print Offer</key> <value>Angebot drucken</value> </entry> + <entry> + <key>relations</key> + </entry> + <entry> + <key>Time</key> + <value>Zeit</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 7a1809e94d1c8a8ce9acbec4d836ff7684a4254a..fd662446d3a6dfb7a7c49144c1a5b90ac6466440 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -2388,6 +2388,15 @@ <entry> <key>Days inactive</key> </entry> + <entry> + <key>Combobox Value</key> + </entry> + <entry> + <key>relations</key> + </entry> + <entry> + <key>Time</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/process/Timetracking_lib/process.js b/process/Timetracking_lib/process.js index 664d6574bedc18c220cea42395ecf787791d5e83..d2128cd195542977845b87086fe6bc0da1f74520 100644 --- a/process/Timetracking_lib/process.js +++ b/process/Timetracking_lib/process.js @@ -44,4 +44,19 @@ Timetracking.createNewTimeTracking = function (pRowId) }; neon.openContext("Timetracking", null, null, neon.OPERATINGSTATE_NEW, params); +} + +/* + * converts minutes tho hours and minuets. e.g. 105 to 1:45 + * + * @param {integer} pMinutes req + * + * @return {String} Hours:Minutes + */ +Timetracking.minutesToReadableHour = function(pMinutes) +{ + var timeHour = parseInt(pMinutes / 60); + var minutes = parseInt(pMinutes % 60); + + return "" + timeHour + ":" + ((minutes <= 9) ? "0" + minutes : minutes); } \ No newline at end of file