- REsource Management:

  Working on reports

lib/project-timeline.tcl

@@ -295,7 +295,7 @@ switch $diagram_aggregation_level {
 }
 
 # ------------------------------------------------------------
-# 
+# Prepare JSON data for diagram
 # ------------------------------------------------------------
 
 set data_json "\[\n"
@@ -308,5 +308,5 @@ foreach oid $oids {
 }
 set object_fields_json [join $object_list ", "]
 
-lappend object_list "'availability'"
+if {"" != $diagram_availability} { lappend object_list "'availability'" }
 set all_fields_json [join $object_list ", "]

sencha-reporting-portfolio.info

@@ -21,6 +21,7 @@
         <requires url="sencha-v407" version="4.0.0.0.0"/>
         <requires url="intranet-core" version="4.0.1.0.0"/>
         <requires url="intranet-rest" version="4.0.1.0.0"/>
+        <requires url="intranet-resource-management" version="4.0.1.0.0"/>
 
         <callbacks>
         </callbacks>

sql/postgresql/sencha-reporting-portfolio-create.sql

@@ -11,6 +11,11 @@
 -- Portlets
 ----------------------------------------------------
 
+
+-- ------------------------------------------------------------
+-- Project List Page
+-- ------------------------------------------------------------
+
 SELECT im_component_plugin__new (
 	null,					-- plugin_id
 	'im_component_plugin',			-- object_type
@@ -77,6 +82,10 @@ SELECT im_component_plugin__new (
 
 
 
+-- ------------------------------------------------------------
+-- Project View Page
+-- ------------------------------------------------------------
+
 SELECT im_component_plugin__new (
 	null,					-- plugin_id
 	'im_component_plugin',			-- object_type
@@ -94,6 +103,27 @@ SELECT im_component_plugin__new (
 );
 
 
+SELECT im_component_plugin__new (
+	null,					-- plugin_id
+	'im_component_plugin',			-- object_type
+	now(),					-- creation_date
+	null,					-- creation_user
+	null,					-- creation_ip
+	null,					-- context_id
+	'EVA Diagram',				-- plugin_name
+	'sencha-reporting-portfolio',		-- package_name
+	'bottom',				-- location
+	'/intranet/projects/view',		-- page_url
+	null,					-- view_name
+	20,					-- sort_order
+	'sencha_project_eva -project_id $project_id'	-- Portlet TCL
+);
+
+
+
+-- ------------------------------------------------------------
+-- Resource Management Page
+-- ------------------------------------------------------------
 
 
 SELECT im_component_plugin__new (
@@ -103,16 +133,17 @@ SELECT im_component_plugin__new (
 	null,					-- creation_user
 	null,					-- creation_ip
 	null,					-- context_id
-	'Project Timeline',			-- plugin_name
+	'Skill Profiles Timeline',			-- plugin_name
 	'sencha-reporting-portfolio',		-- package_name
 	'bottom',				-- location
-	'/intranet/index',				-- page_url
+	'/intranet-resource-management/index',	-- page_url
 	null,					-- view_name
 	10,					-- sort_order
-	'sencha_project_timeline -diagram_aggregation_level month'	-- Portlet TCL
+	'sencha_project_timeline -diagram_aggregation_level month -diagram_dimension users'	-- Portlet TCL
 );
 
 
+
 SELECT im_component_plugin__new (
 	null,					-- plugin_id
 	'im_component_plugin',			-- object_type
@@ -120,12 +151,13 @@ SELECT im_component_plugin__new (
 	null,					-- creation_user
 	null,					-- creation_ip
 	null,					-- context_id
-	'EVA Diagram',				-- plugin_name
+	'Project Timeline',			-- plugin_name
 	'sencha-reporting-portfolio',		-- package_name
 	'bottom',				-- location
-	'/intranet/projects/view',		-- page_url
+	'/intranet-resource-management/index',	-- page_url
 	null,					-- view_name
 	20,					-- sort_order
-	'sencha_project_eva -project_id $project_id'	-- Portlet TCL
+	'sencha_project_timeline -diagram_aggregation_level month -diagram_dimension projects -diagram_height 300'	-- Portlet TCL
 );
 
+

tcl/sencha-reporting-portfolio-procs.tcl

@@ -93,6 +93,7 @@ ad_proc -public sencha_project_timeline {
     {-diagram_start_date ""}
     {-diagram_end_date ""}
     {-diagram_user_id ""}
+    {-diagram_group_id ""}
     {-diagram_project_status_id ""}
     {-diagram_availability ""}
     {-diagram_aggregation_level "month"}
@@ -128,6 +129,7 @@ ad_proc -public sencha_project_timeline {
 		    [list diagram_start_date $diagram_start_date] \
 		    [list diagram_end_date $diagram_end_date] \
 		    [list diagram_user_id $diagram_user_id] \
+		    [list diagram_group_id $diagram_group_id] \
 		    [list diagram_project_status_id $diagram_project_status_id] \
 		    [list diagram_aggregation_level $diagram_aggregation_level] \
 		    [list diagram_availability $diagram_availability] \

www/skill-profile-occupation.tcl

@@ -81,20 +81,17 @@ foreach tuple $skill_profiles {
 #
 # ---------------------------------------------------------------
 
-set sub_navbar ""
-set main_navbar_label "projects"
-
-set project_menu ""
-
-# Show the same header as the ProjectListPage
-set letter ""
-set next_page_url ""
-set previous_page_url ""
+set main_navbar_label "resource_management"
 set menu_select_label "skill-profile-use"
-set sub_navbar [im_project_navbar $letter "/intranet/projects/index" $next_page_url $previous_page_url [list start_idx order_by how_many view_name letter project_status_id] $menu_select_label]
-
-
-
+set bind_vars [ns_set create]
+set parent_menu_id [db_string parent_menu "select menu_id from im_menus where label = :main_navbar_label"]
+set sub_navbar [im_sub_navbar \
+                    -base_url "/intranet-resource-management/index" \
+                    -plugin_url "/intranet-resource-management/index" \
+                    -menu_gif_type "none" \
+                    $parent_menu_id \
+		    $bind_vars "" "pagedesriptionbar" $menu_select_label \
+		    ]
 
 
 # ---------------------------------------------------------------