Changeset 25007

Show
Ignore:
Timestamp:
02/04/10 11:53:02 (1 month ago)
Author:
gudd
Message:

Refs #1632
- added priority for tasks to schema
- edit styles to show priorities

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/ragnaroek/midcom/org.openpsa.projects/config/mgdschema.xml

    r21743 r25007  
    7878                </description> 
    7979        </property> 
    80  
     80        <property name="priority" type="integer" /> 
    8181        <!-- TODO: how to handle "percentages" [as in the 1.x Projects] ? I think they will be a member-like system or something --> 
    8282 

  • branches/ragnaroek/midcom/org.openpsa.projects/config/schemadb_default_task.inc

    r20177 r25007  
    1212            'required' => true, 
    1313        ), 
     14        'priority' => array 
     15        ( 
     16            'title' => 'Priority', 
     17            'storage' => 'priority', 
     18            'type' => 'select', 
     19            'type_config' => array 
     20            ( 
     21                'options' => Array 
     22                ( 
     23                    '1' => 'very high', 
     24                    '2' => 'high', 
     25                    '3' => 'average', 
     26                    '4' => 'low', 
     27                    '5' => 'very low', 
     28                ), 
     29            ), 
     30            'default' => '3', 
     31            'widget' => 'select', 
     32        ), 
    1433        'tags' => Array 
    1534        ( 

  • branches/ragnaroek/midcom/org.openpsa.projects/handler/task/list.php

    r23015 r25007  
    115115            ) 
    116116        ); 
     117        //get possible priorities from schema 
     118        $schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_task')); 
     119        $this->_request_data['priority_array'] = $schemadb['default']->fields['priority']['type_config']['options']; 
     120 
     121        foreach($this->_request_data['priority_array'] as $key => $title) 
     122        { 
     123            $this->_request_data['priority_array'][$key] = array(); 
     124            $this->_request_data['priority_array'][$key]['title'] = $title; 
     125        } 
    117126 
    118127        if (count($args) > 0) 

  • branches/ragnaroek/midcom/org.openpsa.projects/locale/default.de.txt

    r24764 r25007  
    460460---STRINGEND 
    461461 
     462---STRING priority 
     463PrioritÀt 
     464---STRINGEND 
     465 
     466---STRING very high 
     467sehr hoch 
     468---STRINGEND 
     469 
     470---STRING high 
     471hoch 
     472---STRINGEND 
     473 
     474---STRING average 
     475normal 
     476---STRINGEND 
     477 
     478---STRING low 
     479gering 
     480---STRINGEND 
     481 
     482---STRING very low 
     483sehr gering 
     484---STRINGEND 
     485 

  • branches/ragnaroek/midcom/org.openpsa.projects/locale/default.en.txt

    r23195 r25007  
    460460---STRINGEND 
    461461 
     462---STRING priority 
     463Priority 
     464---STRINGEND 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-project-list-status-header.php

    r5048 r25007  
    1313                <th><?php echo $data['l10n']->get('manager'); ?></th> 
    1414                <th><?php echo $data['l10n']->get('customer'); ?></th> 
     15                <th><?php echo $data['l10n']->get('priority'); ?></th> 
    1516                <th><?php echo $data['l10n']->get('start'); ?></th> 
    1617                <th><?php echo $data['l10n']->get('end'); ?></th> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-project-list-status-item.php

    r22825 r25007  
    2222    } 
    2323    ?></td> 
     24    <td> 
     25    <?php 
     26    if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     27    { 
     28          echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     29    } 
     30    ?> 
     31    </td> 
    2432    <td><?php echo strftime("%x", $project->start); ?></td> 
    2533    <td><?php echo strftime("%x", $project->end); ?></td> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-task_table-footer.php

    r20261 r25007  
    44if ($data['view_identifier'] == 'agreement') 
    55{ 
    6     $colspan = 5; 
     6    $colspan = 6; 
    77} 
    88else 
    99{ 
    10     $colspan = 7; 
     10    $colspan = 8; 
    1111} 
    1212?> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-task_table-header.php

    r20261 r25007  
    1919            <th><?php echo $data['l10n']->get('task'); ?></th> 
    2020            <th><?php echo $data['l10n']->get('project'); ?></th> 
     21            <th><?php echo $data['l10n']->get('priority'); ?></th> 
    2122            <?php 
    2223            if ($data['view_identifier'] != 'agreement') 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-task_table-item.php

    r22842 r25007  
    2323        <td> 
    2424            &(cells['parent']:h); 
     25        </td> 
     26        <td> 
     27        <?php 
     28          if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     29          { 
     30              echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     31          } 
     32        ?> 
    2533        </td> 
    2634        <?php 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-completed-item.php

    r22842 r25007  
    4848      </form> 
    4949    </td> 
     50    <?php 
     51        echo "<td>\n"; 
     52        if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     53        { 
     54            echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     55        } 
     56        echo "</td>\n"; 
     57    ?> 
    5058</tr> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-current-item.php

    r22842 r25007  
    4949        ?> 
    5050      </td> 
     51      <td> 
     52      <?php 
     53          if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     54          { 
     55              echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     56          } 
     57      ?> 
     58      </td> 
    5159    </tr> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-header.php

    r22842 r25007  
    33  <tr> 
    44    <th colspan="2"><?php echo $data['l10n']->get($data['view']); ?></th> 
     5    <th> <?php echo $data['l10n']->get('priority'); ?></th> 
    56  </tr> 
    67</thead> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-list-header.php

    r22842 r25007  
    11<tr class="&(data['list_type']);"> 
    2     <th colspan="2"><?php echo $data['l10n']->get($data['list_type'] . ' tasks'); ?></th> 
     2    <th colspan="3"><?php echo $data['l10n']->get($data['list_type'] . ' tasks'); ?></th> 
    33</tr> 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-pending_accept-item.php

    r22842 r25007  
    3737 
    3838echo "</td>\n"; 
     39echo "<td>\n"; 
     40if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     41{ 
     42    echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     43} 
     44echo "</td>\n"; 
    3945echo "</tr>\n"; 
    4046 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-pending_approve-item.php

    r22842 r25007  
    5555?> 
    5656</td> 
     57<?php 
     58echo "<td>\n"; 
     59if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     60{ 
     61    echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     62} 
     63echo "</td>\n"; 
     64?> 
    5765</tr> 
    5866 

  • branches/ragnaroek/midcom/org.openpsa.projects/style/show-tasks-proposed-item.php

    r22842 r25007  
    4343} 
    4444echo "</td>\n"; 
     45echo "<td>\n"; 
     46if(isset($data['priority_array']) && array_key_exists($task->priority , $data['priority_array'])) 
     47{ 
     48    echo $data['l10n']->get($data['priority_array'][$task->priority]['title']); 
     49} 
     50echo "</td>\n"; 
    4551echo "</tr>\n"; 
    4652?>