A bit more work in progress on roles.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0589a0cbe0b1b78068fc3ed05ce693aad75bbf20..a3b7707bcef8a1485eb1d1ecdf95408a4ff5d855 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.17.32.4030 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.32.4031 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/role_edit.tpl b/WEB-INF/templates/role_edit.tpl
index 6ba4ddce9ca48a6a39566c6c30bfc7e45851ac8c..3ad9e6cfe91e0f23c87fce659f61e66c838d15fe 100644 (file)
--- a/WEB-INF/templates/role_edit.tpl
+++ b/WEB-INF/templates/role_edit.tpl
@@ -11,6 +11,10 @@
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.roleForm.description.control}</td>
         </tr>
           <td align = "right">{$i18n.label.description}:</td>
           <td>{$forms.roleForm.description.control}</td>
         </tr>

+        <tr>
+          <td align = "right">{$i18n.form.roles.rank}:</td>
+          <td>{$forms.roleForm.rank.control} <a href="https://www.anuko.com/lp/tt_20.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+        </tr>

         <tr>
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.roleForm.status.control}</td>
         <tr>
           <td align = "right">{$i18n.label.status}:</td>
           <td>{$forms.roleForm.status.control}</td>

diff --git a/role_add.php b/role_add.php
index 71220089e8978bd8de3254a51cd9bec8299f705d..b44304be37aeada3398a0df24ea949c59faf012c 100644 (file)
--- a/role_add.php
+++ b/role_add.php
@@ -61,12 +61,13 @@ if ($request->isPost()) {
   if ($err->no()) {
     $existing_role = ttRoleHelper::getRoleByRank($cl_rank);
     if (!$existing_role) {
   if ($err->no()) {
     $existing_role = ttRoleHelper::getRoleByRank($cl_rank);
     if (!$existing_role) {

-        // Update role information.
+        // Insert a role with default user rights.

         if (ttRoleHelper::insert(array(
           'team_id' => $user->team_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,
         if (ttRoleHelper::insert(array(
           'team_id' => $user->team_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,

+          'rights' => 'data_entry,view_own_data,manage_own_settings,view_users', // Default user rights.

           'status' => ACTIVE))) {
           header('Location: roles.php');
           exit();
           'status' => ACTIVE))) {
           header('Location: roles.php');
           exit();

diff --git a/role_edit.php b/role_edit.php
index 21ed258d1f649f1c3db2992e97702971c6e05d1e..b665e6dcb0ce5701758db83ccaf5fd098eadf187 100644 (file)
--- a/role_edit.php
+++ b/role_edit.php
@@ -49,10 +49,12 @@ $available_rights = array_diff($user->rights_array, $assigned_rights);
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));

+  $cl_rank = $request->getParameter('rank');

   $cl_status = $request->getParameter('status');
 } else {
   $cl_name = $role['name'];
   $cl_description = $role['description'];
   $cl_status = $request->getParameter('status');
 } else {
   $cl_name = $role['name'];
   $cl_description = $role['description'];

+  $cl_rank = $role['rank'];

   $cl_status = $role['status'];
 }
 
   $cl_status = $role['status'];
 }
 


@@ -60,6 +62,14 @@ $form = new Form('roleForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));

+for ($i = 0; $i < $user->role; $i++) {
+  $existing_role_name = null;
+  $rank_data[] = $i;
+}
+$form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
+$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
+  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));

 
 // Multiple select controls for assigned and available rights.
 $form->addInput(array('type'=>'combobox','name'=>'assigned_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$assigned_rights));
 
 // Multiple select controls for assigned and available rights.
 $form->addInput(array('type'=>'combobox','name'=>'assigned_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$assigned_rights));


@@ -67,11 +77,6 @@ $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getK
 $form->addInput(array('type'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
 
 $form->addInput(array('type'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));
 $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
 

-
-$form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-

 if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
     // Validate user input.
 if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
     // Validate user input.