Started coding Work units plugin.

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index cc8264d80c9b34d65c9f42644f2016adad381e81..ad3f5879c2e9a65b87d73fb032d8ebabbb3554a7 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -243,6 +243,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index b73f31a2f73dfdd9d0771bad4ff80c4f321404f9..eb1565e96f018dc96b12f1d6a55bd679bf4c5411 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -253,6 +253,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 668699f610233a7dc74234cbf7e963d24316491a..d506f28df278586a20d7aa6721d5f7f00a14de38 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -224,6 +224,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index e329907f8e370e025122e9a33bd6ed005de916a3..b4ee16f9840ae3c0f4a7d406bd716ef8727dfab6 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -220,6 +220,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Anmelden',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 45dbdfeeb5a77a6511b88f6b25862d6d88f7c2ff..35958adaf06be351fb9887b51e240413f75b84d4 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -211,6 +211,7 @@ $i18n_key_words = array(
 'label.mark_paid' => 'Mark paid',
 'label.week_note' => 'Week note',
 'label.week_list' => 'Week list',
+'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 12796439b642ec05f28470b910570d2a9bdc177f..8693dbb8fc84e538e55eef16f86bea2606007f9d 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -246,6 +246,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Sesión iniciada',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index c007e0f6b75c788841dbcb65a19d959a5976a6cc..aa327deebf5caa3387fa00c865a15d3c5f24548c 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -249,6 +249,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9adc21b10b0761f7b60847a24f58783436f9b48f..6fc87e51b1e1772b755b2df89a327f577db8f9fd 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -236,6 +236,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'ورود',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 79b454debc7dff94ff2aad80648420688e2470e8..5d1417f20930ef9590611d0ed6868ecd8be8c0e1 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -228,6 +228,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Kirjautuminen',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 9a1340230e0060d07060e7f7ca7c71d3eb190223..be9abdeae1f85d508060335337435478b1068288 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -222,6 +222,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Connexion',

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 8573946f6a62ec0796e190871c8c8418b36a69bc..89d0e50c931756894aa6b8a6d49d6f2141a88910 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -212,6 +212,8 @@ $i18n_key_words = array(
 'label.mark_paid' => 'Σήμανση πληρωμένα',
 'label.week_note' => 'Σημείωση εβδομάδας',
 'label.week_list' => 'Λίστα εβδομάδων',
+// TODO: translate the following.
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Σύνδεση',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 7929baa2d1e942d640061106942c12deb62546a2..482a743994a4fe900ac3fd2880b4608268e1d881 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -246,6 +246,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'כניסה',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index e6aa959ad8f32600cb7f6832683a32b5fb7447b6..375664b860c209784383239053bbd8295ea2494b 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -246,6 +246,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Bejelentkezés',

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 2a02eb045b1beca1995605ca5aada0023b4fcad6..60310ebd6a9a46056cac50de418f13044b34e4c8 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -217,6 +217,8 @@ $i18n_key_words = array(
 'label.mark_paid' => 'Segna come pagato',
 'label.week_note' => 'Nota settimanale',
 'label.week_list' => 'Lista settimanale',
+// TODO: translate the following.
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 75a1546fb52f349437ef87729415859f13fdcaf0..9241d735fd14f43957611ac3e4f0fc20c6a1d1dd 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -251,6 +251,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'ログイン',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 1f16aff58f2d154585df1b7cf2d4747a59653887..0d39209b461f0447dfa2dcc52af1b12febd3d0f3 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -251,6 +251,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => '로그인',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 18e1cf8537e71fbc45834976fed4423820b728e8..961651fd0b12de5390ee46e1f090dec2095825d6 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -210,6 +210,8 @@ $i18n_key_words = array(
 'label.mark_paid' => 'Markeer als betaald',
 'label.week_note' => 'Week aantekening',
 'label.week_list' => 'Week overzicht',
+// TODO: translate the following.
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Aanmelden',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b4deac5c132ed0f049f2eb2e332d86619b60fe5e..d218341f5ed662629517229dcd7b563de2d696c1 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -249,6 +249,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Innlogging',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index fb48e7bcf2368958fc94022f9802b4834b96fb05..e218b929ed05a46672ca8824c5fb15335ebcfb4c 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -229,6 +229,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Logowanie',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 968f78cb47ec515c6027ef87e14d20e084a00b06..a90308127c18ad880982972c7765d3aff88d6c37 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -226,6 +226,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index ff6d7130a4f26b5960295c48e8ce0e06e2259899..30ed9bded12cb73fe2adf6905a63f7eab61c567e 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -238,6 +238,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Login',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 217f6741383f9a6a78a6a82e2a1f29ef67301f96..f4f0c85bb6c572cf73058b678efd90f9d29f1caf 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -250,6 +250,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // TODO: Improve titles for consistency, so that each title explains correctly what each

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 51413f2838459b4d39b9b5566fa8d2dc8d7dc17d..d3276d88f4b04d31fc174f846718db6bb63ecf5d 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -210,6 +210,7 @@ $i18n_key_words = array(
 'label.mark_paid' => 'Отметить оплату',
 'label.week_note' => 'Комментарий недели',
 'label.week_list' => 'Список недели',
+'label.work_units' => 'Единицы работы',
 
 // Form titles.
 'title.login' => 'Вход в систему',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index e80db533aabdd350a49204148bca861fc9435c27..3f5081218d25005ed43caacbada86d0370352ec4 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -236,6 +236,7 @@ $i18n_key_words = array(
 // 'button.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Prihlásenie',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 6bf161e202ad3ddc8169ff122ed99effc0552cee..f85164b9ca34de2a266d9735648b404abfbb568e 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -233,6 +233,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Prijava',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 5754b603bb3bdb9efcfda3c056df376e8ce34bc3..a2287f384f5a79c5e92a61f07f130e71ca3a1dd7 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -228,6 +228,7 @@ $i18n_key_words = array(
 // 'button.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => 'Prijava',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index cee942fb065f652ea085a105c083176c905e2296..0b96da48db39b4696bbee2367d38b670fa486f91 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -222,6 +222,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Rubriker för formulär
 'title.login' => 'Logga in',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 111b2d49bc466ff4d19eb13ef24eb1c030e087eb..3683e3affe3f1063cb45fa537c55b617aaebbb09 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -257,6 +257,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 // Form titles.

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 4d5307b7832eb3b894229cda1063d777331ba21b..519faa960df671f7787f31cba6139809d273941c 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -240,6 +240,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => '登录',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 9665a6a15c0a0ffc80bd08e5bbb96603e865160b..0cf2d6c66b436d7320db2741db0ce46a88d0f35c 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -247,6 +247,7 @@ $i18n_key_words = array(
 // 'label.mark_paid' => 'Mark paid',
 // 'label.week_note' => 'Week note',
 // 'label.week_list' => 'Week list',
+// 'label.work_units' => 'Work units',
 
 // Form titles.
 'title.login' => '登錄',

diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 144971b0396ceed6e62f8dbaf0592eca1d51f423..a8f56a2d763f8ab7bacc13c24c57c6b292e03224 100644 (file)
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -91,6 +91,14 @@ function handlePluginCheckboxes() {
   } else {
     configureLabel.style.visibility = "hidden";
   }
+
+  var workUnitsCheckbox = document.getElementById("work_units");
+  configureLabel = document.getElementById("work_units_config");
+  if (workUnitsCheckbox.checked){
+    configureLabel.style.visibility = "visible";
+  } else {
+    configureLabel.style.visibility = "hidden";
+  }
 }
 </script>
 
@@ -239,6 +247,12 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.groupForm.week_view.control}</td>
             <td><label for="week_view">{$i18n.label.week_view}</label> <span id="week_view_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
           </tr>
+  {if defined('WORK_UNITS_DEBUG')}
+          <tr>
+            <td align="right" nowrap>{$forms.groupForm.work_units.control}</td>
+            <td><label for="week_view">{$i18n.label.work_units}</label> <span id="work_units_config"><a href="week_view.php">{$i18n.label.configure}</a></span></td>
+          </tr>
+  {/if}
 {/if}
 
           <tr>

diff --git a/group_edit.php b/group_edit.php
index d79ba2d3593d702204f1bcd738e33133a78f72f2..676a4d777a426b4afc87ee14dc50b299bb6823b3 100644 (file)
--- a/group_edit.php
+++ b/group_edit.php
@@ -75,6 +75,7 @@ if ($request->isPost()) {
   $cl_locking = $request->getParameter('locking');
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
+  $cl_work_units = $request->getParameter('work_units');
 } else {
   $cl_group = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
@@ -109,6 +110,7 @@ if ($request->isPost()) {
   $cl_locking = in_array('lk', $plugins);
   $cl_quotas = in_array('mq', $plugins);
   $cl_week_view = in_array('wv', $plugins);
+  $cl_work_units = in_array('wu', $plugins);
 }
 
 $form = new Form('groupForm');
@@ -207,6 +209,10 @@ $form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_no
 $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
+if (defined('WORK_UNITS_DEBUG')) {
+  $form->addInput(array('type'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
+}
+
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 if ($user->can('delete_group')) $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));