- Moved getDebug() to Utilities, deleted crud, cleanup rests of resize

www/index.adp

@@ -38,22 +38,14 @@ Ext.require([
     'PO.view.field.POComboTree'
 ]);
 
-// Global parameters from server-side
-var default_material_id = parseInt('@default_material_id@');			// "Default" material
-var default_cost_center_id = parseInt('@default_cost_center_id@');		// "The Company" cost-center
-var default_uom_id = parseInt('@default_uom_id@');				// "Hour" default Unit of Measure
-var default_effort_driven_type_id = parseInt('@default_effort_driven_type_id@'); // "Fixed Effort" as default
-
-
-
 function launchTimesheetWeeklyLogging(){
-
     // -----------------------------------------------------------------------
     // Stores
     var hourStore = Ext.StoreManager.get('hourStore');
     var taskTreeStore = Ext.StoreManager.get('taskTreeStore');
     var projectStore = Ext.StoreManager.get('projectMainStore');
 
+    // -----------------------------------------------------------------------
     // Row-Editor for the hour grid
     var rowEditing = Ext.create('Ext.grid.plugin.RowEditing', {
         clicksToEdit: 1,
@@ -199,7 +191,7 @@ function launchTimesheetWeeklyLogging(){
     var width = screenSize.width - sideBarSize.width - 95;
     var height = screenSize.height - 280;
 
-    Ext.define('PO.view.timesheet.HourWeeklyButtonPanel', {
+    Ext.define('PO.tsweekly.HourWeeklyButtonPanel', {
         extend: 'Ext.panel.Panel',
         alias: 'ganttButtonPanel',
         width: 900,
@@ -237,7 +229,7 @@ function launchTimesheetWeeklyLogging(){
     });
 
     // Use the button panel as a container for the task tree and the hour grid
-    var hourButtonPanel = Ext.create('PO.view.timesheet.HourWeeklyButtonPanel', {
+    var hourButtonPanel = Ext.create('PO.tsweekly.HourWeeklyButtonPanel', {
         renderTo: '@task_editor_id@',
         width: width,
         height: height,
@@ -247,7 +239,6 @@ function launchTimesheetWeeklyLogging(){
         ]
     });
 
-    var sideBarTab = Ext.get('sideBarTab');
     var hourController = Ext.create('PO.tsweekly.HourWeeklyController', {
         'hourButtonPanel': hourButtonPanel,
         'hourController': hourController,
@@ -256,54 +247,26 @@ function launchTimesheetWeeklyLogging(){
     hourController.init(this).onLaunch(this);
     hourGrid.hourController = hourController;   // Add reference to hourGrid
 
-
-
-
+    // -----------------------------------------------------------------------
     // Controller to handle size and resizing related events
     var renderDiv = Ext.get("@task_editor_id@");
     var resizeController = Ext.create('PO.controller.ResizeController', {
-        debug: getDebug('resizeController'),
+        debug: PO.Utilities.getDebug('resizeController'),
         redrawPanel: hourButtonPanel,						// panel with redraw() function and needsRedraw variable
         renderDiv: renderDiv,							// container of outerContainer
         outerContainer: hourButtonPanel					// outermost panel with resize border
     }).init();
     resizeController.onLaunch(this);
     resizeController.onResize();						// Set the size of the outer GanttButton Panel
-
-
-
-
-
-    // Testing events
-    hourButtonPanel.fireEvent('keypress');
-
-    // -----------------------------------------------------------------------
-    // Handle collapsable side menu
-    sideBarTab.on('click', hourController.onSideBarResize, hourController);
-    Ext.EventManager.onWindowResize(hourController.onWindowsResize, hourController);    // Deal with resizing the main window
 };
 
 
-var debugHash = @debug_json;noquote@;
-function getDebug(id) {
-    // Check for a debug setting for the specific Id
-    var debug = parseInt(debugHash[id]);
-    if (!isNaN(debug)) return debug;
-
-    // Use the default debug
-    debug = parseInt(debugHash['default']);
-    if (!isNaN(debug)) return debug;
-
-    // invalid configuration - enable debug
-    return 1;
-};
-
 // -----------------------------------------------------------------------
 // Start the application after loading the necessary stores
 //
 Ext.onReady(function() {
     Ext.QuickTips.init();
-    var debug = getDebug('default');
+    var debug = PO.Utilities.getDebug('default');
     var taskTreeStore = Ext.create('PO.store.timesheet.TaskTreeStore');
     var hourStore = Ext.create('PO.store.timesheet.HourStore');
     var projectStore = Ext.create('PO.store.project.ProjectMainStore');

www/index.tcl

@@ -46,11 +46,3 @@ set default_uom_id [im_uom_hour]
 set default_effort_driven_type_id [parameter::get_from_package_key -package_key "intranet-ganttproject" -parameter "DefaultEffortDrivenTypeId" -default "9722"]
 
 
-# Create a debug JSON object that controls logging verbosity
-set debug_default "default 0"
-set debug_list [parameter::get_from_package_key -package_key "intranet-gantt-editor" -parameter DebugHash -default $debug_default]
-array set debug_hash $debug_list
-set debug_json_list {}
-foreach id [array names debug_hash] { lappend debug_json_list "'$id': $debug_hash($id)" }
-set debug_json "{\n\t[join $debug_json_list ",\n\t"]\n}"
-