[WTF CVS] wtf/lib/WTF Pages.pm, 1.5, 1.6 SQL.pm, 1.11, 1.12 Utils.pm, 1.5, 1.6

[Gryphon S. <gry...@us...>]

Update of /cvsroot/wtf-tracker/wtf/lib/WTF
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17860/lib/WTF

Modified Files:
	Pages.pm SQL.pm Utils.pm 
Log Message:
Changes to support the addition of feature request 1618513: vacation scheduler and OOO calendar

Index: SQL.pm
===================================================================
RCS file: /cvsroot/wtf-tracker/wtf/lib/WTF/SQL.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SQL.pm	21 Dec 2006 19:33:54 -0000	1.11
--- SQL.pm	2 Jan 2007 23:13:28 -0000	1.12
***************
*** 89,93 ****
  			IF( p.name IS NULL, t.name, CONCAT( p.name, ' (', t.name, ')' ) ) AS project,
  			IF( p.bug IS NULL, 'NPT', p.bug ) AS bug,
! 			DATE_FORMAT(w.work_day, "%W, %M %e, %Y") AS work_day,
  			w.work_day AS date, w.hours
  		FROM work AS w
--- 89,93 ----
  			IF( p.name IS NULL, t.name, CONCAT( p.name, ' (', t.name, ')' ) ) AS project,
  			IF( p.bug IS NULL, 'NPT', p.bug ) AS bug,
! 			DATE_FORMAT( w.work_day, "%W, %M %e, %Y" ) AS work_day,
  			w.work_day AS date, w.hours
  		FROM work AS w
***************
*** 379,382 ****
--- 379,413 ----
  	},
  
+ 	'vacation_sick' => q{
+ 		SELECT 
+ 			work_day AS end_date, 
+ 			work_day - INTERVAL 1 DAY AS previous_day, 
+ 			vacation, sick 
+ 		FROM summary
+ 		WHERE employee_id = ? AND ( vacation = 1 OR sick = 1 ) AND work_day <= NOW()
+ 		ORDER BY work_day DESC
+ 	},
+ 
+ 	'future_vacation' => q{
+ 		SELECT work_day AS end_date, work_day - INTERVAL 1 DAY AS previous_day
+ 		FROM summary
+ 		WHERE employee_id = ? AND vacation = 1 AND work_day > NOW()
+ 		ORDER BY work_day DESC
+ 	},
+ 
+ 	'delete_vacation' => 'DELETE FROM summary WHERE employee_id = ? AND work_day BETWEEN ? AND ?',
+ 
+ 	'add_vacation' => 'INSERT INTO summary ( employee_id, work_day, vacation ) VALUES ( ?, ?, 1 )',
+ 
+ 	'ooo_calendar' => q{
+ 		SELECT
+ 			DATE_FORMAT( s.work_day, "%W, %M %e, %Y" ) AS date,
+ 			e.name AS employee, s.vacation, s.sick
+ 		FROM summary AS s
+ 		INNER JOIN employee AS e ON s.employee_id = e.id
+ 		WHERE ( s.vacation = 1 OR s.sick = 1 ) AND s.work_day BETWEEN ? AND ?
+ 		ORDER BY s.work_day, e.name
+ 	},
+ 
  );
  

Index: Pages.pm
===================================================================
RCS file: /cvsroot/wtf-tracker/wtf/lib/WTF/Pages.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pages.pm	2 Dec 2006 00:09:09 -0000	1.5
--- Pages.pm	2 Jan 2007 23:13:28 -0000	1.6
***************
*** 21,45 ****
  	# the subclass to handle page generation
  	DISPATCH_TABLE => {
! 		'/input'            => [ 'Input',   'screen_input'            ],
! 		'/input/projects'   => [ 'Input',   'screen_projects'         ],
! 		'/input/tasks'      => [ 'Input',   'screen_tasks'            ],
! 		'/input/tracking'   => [ 'Input',   'screen_tracking'         ],
! 		'/input/timesheet'  => [ 'Input',   'action_save_timesheet'   ],
! 		'/reports/myweekly' => [ 'Reports', 'screen_myweekly'         ],
! 		'/reports/team'     => [ 'Reports', 'screen_team_view'        ],
! 		'/reports/projects' => [ 'Reports', 'screen_projects_list'    ],
! 		'/reports/project'  => [ 'Reports', 'screen_project_view'     ],
! 		'/reports/activity' => [ 'Reports', 'screen_activity_summary' ],
! 		'/admin/authz'      => [ 'Admin',   'screen_authz'            ],
! 		'/admin/newauthzs'  => [ 'Admin',   'action_save_new_authzs'  ],
! 		'/admin/update'     => [ 'Admin',   'action_update'           ],
! 		'/admin/users'      => [ 'Admin',   'screen_users'            ],
! 		'/admin/saveusers'  => [ 'Admin',   'action_save_users'       ],
! 		'/admin/taskarea'   => [ 'Admin',   'screen_task_area'        ],
! 		'/admin/savetarea'  => [ 'Admin',   'action_save_task_area'   ],
! 		'/admin/loginas'    => [ 'Admin',   'action_login_as'         ],
! 		'/admin/revert'     => [ 'Admin',   'action_revert_to_self'   ],
! 		'/admin/tables'     => [ 'Admin',   'screen_table_data'       ],
! 		'/admin/tablesave'  => [ 'Admin',   'action_save_table_data'  ],
  	},
  };
--- 21,48 ----
  	# the subclass to handle page generation
  	DISPATCH_TABLE => {
! 		'/input'             => [ 'Input',   'screen_input'             ],
! 		'/input/projects'    => [ 'Input',   'screen_projects'          ],
! 		'/input/tasks'       => [ 'Input',   'screen_tasks'             ],
! 		'/input/tracking'    => [ 'Input',   'screen_tracking'          ],
! 		'/input/timesheet'   => [ 'Input',   'action_save_timesheet'    ],
! 		'/input/myvacation'  => [ 'Input',   'screen_myvacation'        ],
! 		'/input/newvacation' => [ 'Input',   'action_save_new_vacation' ],
! 		'/reports/myweekly'  => [ 'Reports', 'screen_myweekly'          ],
! 		'/reports/team'      => [ 'Reports', 'screen_team_view'         ],
! 		'/reports/projects'  => [ 'Reports', 'screen_projects_list'     ],
! 		'/reports/project'   => [ 'Reports', 'screen_project_view'      ],
! 		'/reports/activity'  => [ 'Reports', 'screen_activity_summary'  ],
! 		'/reports/calendar'  => [ 'Reports', 'screen_ooo_calendar'      ],
! 		'/admin/authz'       => [ 'Admin',   'screen_authz'             ],
! 		'/admin/newauthzs'   => [ 'Admin',   'action_save_new_authzs'   ],
! 		'/admin/update'      => [ 'Admin',   'action_update'            ],
! 		'/admin/users'       => [ 'Admin',   'screen_users'             ],
! 		'/admin/saveusers'   => [ 'Admin',   'action_save_users'        ],
! 		'/admin/taskarea'    => [ 'Admin',   'screen_task_area'         ],
! 		'/admin/savetarea'   => [ 'Admin',   'action_save_task_area'    ],
! 		'/admin/loginas'     => [ 'Admin',   'action_login_as'          ],
! 		'/admin/revert'      => [ 'Admin',   'action_revert_to_self'    ],
! 		'/admin/tables'      => [ 'Admin',   'screen_table_data'        ],
! 		'/admin/tablesave'   => [ 'Admin',   'action_save_table_data'   ],
  	},
  };

Index: Utils.pm
===================================================================
RCS file: /cvsroot/wtf-tracker/wtf/lib/WTF/Utils.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Utils.pm	3 Dec 2006 00:05:52 -0000	1.5
--- Utils.pm	2 Jan 2007 23:13:28 -0000	1.6
***************
*** 190,194 ****
  		$day_in_desired_week_or_days_count > 0
  	) {
! 		$time_start = time - 86_400 * $day_in_desired_week_or_days_count;
  	}
  	else {
--- 190,194 ----
  		$day_in_desired_week_or_days_count > 0
  	) {
! 		$time_start = time - 86_400 * $day_in_desired_week_or_days_count; # 86_400 = 1 day
  	}
  	else {