Changeset 17917
- Timestamp:
- 10/04/08 14:59:15 (2 months ago)
- Files:
-
- trunk/midcom/org.openpsa.mypage/handler/weekreview.php (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/config/midcom_dba_classes.inc (modified) (1 diff)
- trunk/midcom/org.openpsa.projects/hour (added)
- trunk/midcom/org.openpsa.projects/hour/report.php (moved) (moved from trunk/midcom/org.openpsa.projects/hour_report_midcomdba.php) (3 diffs, 1 prop)
- trunk/midcom/org.openpsa.projects/midcom/interfaces.php (modified) (1 diff)
- trunk/midcom/org.openpsa.relatedto/handler/relatedto.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/org.openpsa.mypage/handler/weekreview.php
r17914 r17917 321 321 midcom_show_style('weekreview-day-item-event'); 322 322 break; 323 case ' midcom_org_openpsa_hour_report':323 case 'org_openpsa_projects_hour_report': 324 324 midcom_show_style('weekreview-day-item-hour-report'); 325 325 trunk/midcom/org.openpsa.projects/config/midcom_dba_classes.inc
r17916 r17917 15 15 'old_class_name' => null, 16 16 'new_class_name' => 'org_openpsa_hour_report', 17 'midcom_class_name' => ' midcom_org_openpsa_hour_report'17 'midcom_class_name' => 'org_openpsa_projects_hour_report' 18 18 ), 19 19 array( trunk/midcom/org.openpsa.projects/hour/report.php
- Property svn:mergeinfo set
r14773 r17917 12 12 * @package org.openpsa.projects 13 13 */ 14 class midcom_org_openpsa_hour_report extends __midcom_org_openpsa_hour_report14 class org_openpsa_projects_hour_report extends __org_openpsa_projects_hour_report 15 15 { 16 // Simple readonly boolean property on whethe this is invoiced16 // Simple readonly boolean property on whether this is invoiced 17 17 var $is_invoiced = false; 18 18 var $is_approved = false; … … 39 39 { 40 40 //Make sure our hours property is a float 41 $this->hours = (float) $this->hours;41 $this->hours = (float) $this->hours; 42 42 $this->hours = round($this->hours, 2); 43 43 … … 158 158 } 159 159 160 /**161 * Another wrap level to get to component namespace162 * @package org.openpsa.projects163 */164 class org_openpsa_projects_hour_report extends midcom_org_openpsa_hour_report165 {166 function __construct($identifier=NULL)167 {168 return parent::__construct($identifier);169 }170 }171 160 ?> trunk/midcom/org.openpsa.projects/midcom/interfaces.php
r17916 r17917 23 23 $this->_autoload_files = array 24 24 ( 25 'hour_report_midcomdba.php',26 25 'deliverables/deliverable_midcomdba.php', 27 26 /* trunk/midcom/org.openpsa.relatedto/handler/relatedto.php
r17904 r17917 259 259 $this->_show_render_line_salesproject(); 260 260 break; 261 case is_a($this->_request_data['link_other_obj'], ' midcom_org_openpsa_hour_report'):261 case is_a($this->_request_data['link_other_obj'], 'org_openpsa_projects_hour_report'): 262 262 $this->_show_render_line_hour_report(); 263 263 break;
