Changeset 1646

Show
Ignore:
Timestamp:
02/26/10 15:11:04 (5 months ago)
Author:
thomas
Message:

updated ullTime tests + updated ullTime list

Location:
trunk
Files:
6 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/plugins/ullCorePlugin/lib/ullTestBrowser.class.php

    r1633 r1646  
    409409        'project_reporting', 
    410410        'project_total', 
     411        'delta', 
    411412       ) 
    412413    ); 
    … …  
    424425        'project_reporting', 
    425426        'project_total', 
     427        'delta', 
     428       ) 
     429    ); 
     430     
     431    return $s; 
     432  } 
     433   
     434  public function getDgsUllTimeListTableSum() 
     435  { 
     436    $s = new ullDomGridSelector('table#ull_time_list > tbody', 'tr.list_table_sum', 'td', array(),       
     437      array( 
     438        'day', 
     439        'time_reporting', 
     440        'time_total', 
     441        'project_reporting', 
     442        'project_total', 
     443        'delta', 
    426444       ) 
    427445    ); 

  • trunk/plugins/ullTimePlugin/modules/ullTime/lib/BaseUllTimeActions.class.php

    r1638 r1646  
    669669        $week['dates'][$date]['sum_delta'] = $sumDelta; 
    670670        $week['sum_delta'] += $sumDelta; 
    671         $this->totals['project'] += $sumDelta; 
     671        $this->totals['delta'] += $sumDelta; 
    672672         
    673673        // mark future dates 

  • trunk/plugins/ullTimePlugin/modules/ullTime/templates/listSuccess.php

    r1638 r1646  
    9999    </tr>   
    100100   
    101     <tr class="list_table_sum"> 
     101    <tr class="list_table_sum list_table_total_sum"> 
    102102      <td></td> 
    103103      <td></td> 
    … …  
    105105      <td></td> 
    106106      <td><?php echo $time_duration_widget_with_zero->render(null, $totals['project']) ?></td> 
     107      <td><?php echo $time_duration_widget_with_zero->render(null, $totals['delta']) ?></td> 
    107108    </tr>  
    108109      

  • trunk/test/functional/frontend/ullTimePlugin/ullTimeBasicAsUserTest.php

    r1645 r1646  
    9797    ->checkElement($dgsListToday->get(1, 'time_total'), '5:00') 
    9898    ->checkElement($dgsListToday->get(1, 'project_total'), '2:55') 
     99    ->checkElement($dgsListToday->get(1, 'delta'), '2:05') 
    99100  ->end() 
    100101; 

  • trunk/test/functional/frontend/ullTimePlugin/ullTimePeriodOverviewTest.php

    r1642 r1646  
    88$b->resetDatabase(); 
    99$dgsList = $b->getDgsUllTimeList(); 
    10 $dgsListEdit = $b->getDgsUllTimeEditList(); 
     10$dgsListSum = $b->getDgsUllTimeListTableSum(); 
    1111 
     12$newTimeReport = new UllTimeReporting(); 
     13$newTimeReport->UllUser = Doctrine::getTable('UllUser')->findOneByUserName('test_user'); 
     14$newTimeReport->date = '2009-10-27'; 
     15$newTimeReport->begin_work_at = '09:00:00'; 
     16$newTimeReport->end_work_at = '14:00:00'; 
     17$newTimeReport->save(); 
     18 
     19$newTimeReport = new UllTimeReporting(); 
     20$newTimeReport->UllUser = Doctrine::getTable('UllUser')->findOneByUserName('test_user'); 
     21$newTimeReport->date = '2009-10-28'; 
     22$newTimeReport->begin_work_at = '08:45:00'; 
     23$newTimeReport->end_work_at = '14:15:00'; 
     24$newTimeReport->save(); 
     25 
     26$newProjectReport = new UllProjectReporting(); 
     27$newProjectReport->UllUser = Doctrine::getTable('UllUser')->findOneByUserName('test_user'); 
     28$newProjectReport->UllProject = Doctrine::getTable('UllProject')->findOneBySlug('introduce-ullright'); 
     29$newProjectReport->date = '2009-10-27'; 
     30$newProjectReport->duration_seconds = 9900; //02:45 
     31$newProjectReport->save(); 
     32 
     33$newProjectReport = new UllProjectReporting(); 
     34$newProjectReport->UllUser = Doctrine::getTable('UllUser')->findOneByUserName('test_user'); 
     35$newProjectReport->UllProject = Doctrine::getTable('UllProject')->findOneBySlug('meeting-room-furniture'); 
     36$newProjectReport->date = '2009-10-27'; 
     37$newProjectReport->duration_seconds = 8100; //02:15 
     38$newProjectReport->save(); 
     39 
     40$newProjectReport = new UllProjectReporting(); 
     41$newProjectReport->UllUser = Doctrine::getTable('UllUser')->findOneByUserName('test_user'); 
     42$newProjectReport->UllProject = Doctrine::getTable('UllProject')->findOneBySlug('introduce-ullright'); 
     43$newProjectReport->date = '2009-10-28'; 
     44$newProjectReport->duration_seconds = 5100; //01:25 
     45$newProjectReport->save(); 
     46 
     47$newProjectReport = new UllProjectReporting(); 
     48$newProjectReport->UllUser = Doctrine::getTable('UllUser')->findOneByUserName('test_user'); 
     49$newProjectReport->UllProject = Doctrine::getTable('UllProject')->findOneBySlug('meeting-room-furniture'); 
     50$newProjectReport->date = '2009-10-28'; 
     51$newProjectReport->duration_seconds = 4200; //01:10 
     52$newProjectReport->save(); 
    1253 
    1354// TODO: rename to PeriodOverviewTest 
    … …  
    2162  ->diag('ullTime Home') 
    2263  ->get('ullAdmin/index') 
    23   ->loginAsAdmin() 
     64  ->loginAs() 
    2465  ->get('ullTime/index') 
    2566  ->isStatusCode(200) 
    … …  
    3071;   
    3172 
    32 // TODO: select period -> click on date 
    33  
    3473$b 
    35   ->diag('index: go to Timereporting for 2009-10-27') 
    36   ->get('ullTime/create/date/2009-10-27') 
     74  ->diag('index: go to overwiew october 2009') 
     75  ->click('October 2009') 
    3776  ->isStatusCode(200) 
    38   ->with('request')->begin() 
    39     ->isParameter('module', 'ullTime') 
    40     ->isParameter('action', 'create') 
    41     ->isParameter('date', '2009-10-27') 
    42   ->end() 
    43 ; 
    44  
    45 $b 
    46   ->diag('create: enter begin and end time, then click on save') 
    47   ->setField('fields[begin_work_at]','9:00') 
    48   ->setField('fields[end_work_at]','14:00') 
    49   ->click('Save and return to list') 
    50   ->isRedirected() 
    51   ->followRedirect() 
    52 ; 
    53  
    54 $b 
    55   ->diag('list: check correct working time') 
    56   // call the period manually because we don't have a referer 
    57   ->get('ullTime/list/period/october-2009') 
    58   ->with('request')->begin() 
    59     ->isParameter('module', 'ullTime') 
    60     ->isParameter('action', 'list') 
    61     ->isParameter('period', 'october-2009') 
    62   ->end()   
    63   ->with('response')->begin() 
    64     ->checkElement($dgsList->get(5, 'time_total'), '5:00') 
    65   ->end() 
    66 ; 
    67  
    68  
    69 $b 
    70   ->diag('index: go to Project timereporting for 2009-10-27') 
    71   ->get('ullTime/createProject/username/admin/date/2009-10-27') 
    72   ->isStatusCode(200) 
    73   ->with('request')->begin() 
    74     ->isParameter('module', 'ullTime') 
    75     ->isParameter('action', 'createProject') 
    76   ->end() 
    77 ; 
    78  
    79 $b 
    80   ->diag('create: enter two new project efforts') 
    81   ->setField('fields[ull_project_id]', Doctrine::getTable('UllProject')->findOneBySlug('introduce-ullright')->id) 
    82   ->setField('fields[duration_seconds]','1:45') 
    83   ->click('Save and create another entry') 
    84    
    85   ->isRedirected() 
    86   ->followRedirect() 
    87   ->setField('fields[ull_project_id]','2') 
    88   ->setField('fields[duration_seconds]','1:10') 
    89   ->click('Save and create another entry') 
    90   ->isRedirected() 
    91   ->followRedirect() 
    92   ->with('request')->begin() 
    93     ->isParameter('module', 'ullTime') 
    94     ->isParameter('action', 'createProject') 
    95   ->end() 
    96 ;   
    97  
    98 $b 
    99   ->diag('list: check correct project time') 
    100   ->get('ullTime/list/period/october-2009/username/admin') 
    101   ->with('request')->begin() 
    102     ->isParameter('module', 'ullTime') 
    103     ->isParameter('action', 'list') 
    104   ->end() 
    105   ->with('response')->begin() 
    106     ->checkElement($dgsList->get(5, 'project_total'), '2:55') 
    107   ->end() 
    108 ; 
    109    
    110 $b 
    111   ->diag('index: go to Timereporting for 2009-10-28') 
    112   ->get('ullTime/create/username/admin/date/2009-10-28') 
    113   ->isStatusCode(200) 
    114   ->with('request')->begin() 
    115     ->isParameter('module', 'ullTime') 
    116     ->isParameter('action', 'create') 
    117   ->end() 
    118 ; 
    119  
    120 $b 
    121   ->diag('create: enter begin and end time, then click on save') 
    122   ->setField('fields[begin_work_at]','8:45') 
    123   ->setField('fields[end_work_at]','14:15') 
    124   ->click('Save and return to list') 
    125   ->isRedirected() 
    126   ->followRedirect() 
    127   ->get('ullTime/list/period/october-2009/username/admin') 
    12877  ->with('request')->begin() 
    12978    ->isParameter('module', 'ullTime') 
    … …  
    13382 
    13483$b 
    135   ->diag('list: check correct working time') 
     84  ->diag('list: check times') 
    13685  ->with('response')->begin() 
    137     ->checkElement($dgsList->get(4, 'time_total'), '5:30') 
    138   ->end() 
    139 ; 
    140  
    141 $b 
    142   ->diag('index: go to Project timereporting for 2009-10-28') 
    143   ->get('ullTime/createProject/username/admin/date/2009-10-28') 
    144   ->isStatusCode(200) 
    145   ->with('request')->begin() 
    146     ->isParameter('module', 'ullTime') 
    147     ->isParameter('action', 'createProject') 
    148   ->end() 
    149 ; 
    150  
    151 $b 
    152   ->diag('create: enter two new project efforts') 
    153   ->setField('fields[ull_project_id]','1') 
    154   ->setField('fields[duration_seconds]','1:25') 
    155   ->click('Save and create another entry') 
    156   ->isRedirected() 
    157   ->followRedirect() 
    158   ->setField('fields[ull_project_id]','2') 
    159   ->setField('fields[duration_seconds]','1:00') 
    160   ->click('Save and create another entry') 
    161   ->isRedirected() 
    162   ->followRedirect() 
    163   ->with('request')->begin() 
    164     ->isParameter('module', 'ullTime') 
    165     ->isParameter('action', 'createProject') 
     86    ->checkElement($dgsList->get(4, 'time_total') . ' > span', '5:30') 
     87    ->checkElement($dgsList->get(5, 'time_total') . ' > span', '5:00') 
     88    ->checkElement($dgsListSum->get(1, 'time_total') . ' > span', '10:30') 
     89    ->checkElement($dgsList->get(4, 'project_total') . '> span', '2:35') 
     90    ->checkElement($dgsList->get(5, 'project_total') . '> span', '5:00') 
     91    ->checkElement($dgsListSum->get(1, 'project_total') . '> span', '7:35') 
     92    ->checkElement($dgsList->get(4, 'delta') . '> span', '2:55') 
     93    ->checkElement($dgsList->get(5, 'delta'), '') 
     94    ->checkElement($dgsListSum->get(1, 'delta') . '> span', '2:55') 
    16695  ->end() 
    16796;   
    16897 
    16998$b 
    170   ->diag('list: check correct project time') 
    171   ->get('ullTime/list/period/october-2009/username/admin') 
    172   ->with('request')->begin() 
    173     ->isParameter('module', 'ullTime') 
    174     ->isParameter('action', 'list') 
    175   ->end() 
     99  ->diag('list: check total times') 
    176100  ->with('response')->begin() 
    177     ->checkElement($dgsList->get(4, 'project_total'), '2:25') 
     101    ->checkElement('tr.list_table_total_sum > td + td + td > span', '10:30')  //time_total 
     102    ->checkElement('tr.list_table_total_sum > td + td + td + td + td > span', '7:35')  //project_total 
     103    ->checkElement('tr.list_table_total_sum > td + td + td + td + td + td > span', '2:55')  //delta_total 
    178104  ->end() 
    179105;   
    180  
    181 $b 
    182   ->diag('list: check sum times') 
    183   ->get('ullTime/list/period/october-2009/username/admin') 
    184   ->with('request')->begin() 
    185     ->isParameter('module', 'ullTime') 
    186     ->isParameter('action', 'list') 
    187   ->end() 
    188   ->with('response')->begin() 
    189     ->checkElement($dgsList->get(7, 'time_total') . ' > span', '10:30') 
    190     ->checkElement($dgsList->get(7, 'project_total') . '> span', '5:20') 
    191   ->end() 
    192 ;   
    193  
    194 //TODO: total sum 

  • trunk/test/functional/frontend/ullTimePlugin/ullTimeProjectEffortsTest.php

    r1645 r1646  
    117117    ->checkElement($dgsListToday->get(1, 'time_total'), '8:00') 
    118118    ->checkElement($dgsListToday->get(1, 'project_total'), '3:00') 
     119    ->checkElement($dgsListToday->get(1, 'delta'), '5:00') 
    119120  ->end() 
    120121; 

  • trunk/test/functional/frontend/ullTimePlugin/ullTimeReportProjectTest.php

    r1637 r1646  
    111111$b 
    112112  ->diag('list: check correct times by projects') 
    113   ->setField('filter[ull_project_id]','1') 
     113  ->setField('filter[ull_project_id]', Doctrine::getTable('UllProject')->findOneBySlug('introduce-ullright')->id) 
    114114  ->click('search_list') 
    115115  ->isRedirected() 
    … …  
    119119    ->checkElement($dgsList->get(1, 'duration') ,'12:25')   //9:55 + Testdaten (2:30) 
    120120  ->end() 
    121   ->setField('filter[ull_project_id]','2') 
     121  ->setField('filter[ull_project_id]', Doctrine::getTable('UllProject')->findOneBySlug('meeting-room-furniture')->id) 
    122122  ->click('search_list') 
    123123  ->isRedirected()