Added Indicators Performance Monitoring and Management

MIKEINTOSHSYSTEMS · Nov 23, 2024 · 984846c · 984846c
1 parent 178abe6
commit 984846c
Show file tree

Hide file tree

Showing 197 changed files with 49,308 additions and 554 deletions.
diff --git a/app/admin_rights_list.php b/app/admin_rights_list.php
@@ -1125,6 +1125,74 @@
 
 $pageMask[$table] = $mask;
 $tables[$table] = array("database_backup", " " . "Database Backup");
+$table = "performance_indicators";
+$mask="";
+if( pageEnabled($table, 'add') || pageEnabled($table, 'inline_add') )
+	$mask .= "A";
+if( pageEnabled($table, 'edit') || pageEnabled($table, 'inline_edit') )
+	$mask .= "E";
+if( pageEnabled($table, 'delete') )
+	$mask .= "D";
+if( pageEnabled($table, 'import') )
+	$mask .= "I";
+if( pageEnabled($table, 'view') || pageEnabled($table, 'list') || pageEnabled($table, 'chart') || pageEnabled($table, 'report') || pageEnabled($table, 'dashboard') )
+	$mask .= "S";
+if( pageEnabled($table, 'print') || pageEnabled($table, 'rprint') || pageEnabled($table, 'export')  )
+	$mask .= "P";
+
+$pageMask[$table] = $mask;
+$tables[$table] = array("performance_indicators", " " . "Performance Indicators");
+$table = "performance_tracking";
+$mask="";
+if( pageEnabled($table, 'add') || pageEnabled($table, 'inline_add') )
+	$mask .= "A";
+if( pageEnabled($table, 'edit') || pageEnabled($table, 'inline_edit') )
+	$mask .= "E";
+if( pageEnabled($table, 'delete') )
+	$mask .= "D";
+if( pageEnabled($table, 'import') )
+	$mask .= "I";
+if( pageEnabled($table, 'view') || pageEnabled($table, 'list') || pageEnabled($table, 'chart') || pageEnabled($table, 'report') || pageEnabled($table, 'dashboard') )
+	$mask .= "S";
+if( pageEnabled($table, 'print') || pageEnabled($table, 'rprint') || pageEnabled($table, 'export')  )
+	$mask .= "P";
+
+$pageMask[$table] = $mask;
+$tables[$table] = array("performance_tracking", " " . "Performance Tracking");
+$table = "performance_years";
+$mask="";
+if( pageEnabled($table, 'add') || pageEnabled($table, 'inline_add') )
+	$mask .= "A";
+if( pageEnabled($table, 'edit') || pageEnabled($table, 'inline_edit') )
+	$mask .= "E";
+if( pageEnabled($table, 'delete') )
+	$mask .= "D";
+if( pageEnabled($table, 'import') )
+	$mask .= "I";
+if( pageEnabled($table, 'view') || pageEnabled($table, 'list') || pageEnabled($table, 'chart') || pageEnabled($table, 'report') || pageEnabled($table, 'dashboard') )
+	$mask .= "S";
+if( pageEnabled($table, 'print') || pageEnabled($table, 'rprint') || pageEnabled($table, 'export')  )
+	$mask .= "P";
+
+$pageMask[$table] = $mask;
+$tables[$table] = array("performance_years", " " . "Performance Years");
+$table = "Performance_Overview";
+$mask="";
+if( pageEnabled($table, 'add') || pageEnabled($table, 'inline_add') )
+	$mask .= "A";
+if( pageEnabled($table, 'edit') || pageEnabled($table, 'inline_edit') )
+	$mask .= "E";
+if( pageEnabled($table, 'delete') )
+	$mask .= "D";
+if( pageEnabled($table, 'import') )
+	$mask .= "I";
+if( pageEnabled($table, 'view') || pageEnabled($table, 'list') || pageEnabled($table, 'chart') || pageEnabled($table, 'report') || pageEnabled($table, 'dashboard') )
+	$mask .= "S";
+if( pageEnabled($table, 'print') || pageEnabled($table, 'rprint') || pageEnabled($table, 'export')  )
+	$mask .= "P";
+
+$pageMask[$table] = $mask;
+$tables[$table] = array("performance_overview", " " . "Performance Overview");
 
 if ( pageEnabled(GLOBAL_PAGES, 'menu') )
 	$pageMask[GLOBAL_PAGES] = "S";

diff --git a/app/classes/charts.php b/app/classes/charts.php
@@ -530,6 +530,14 @@ protected function isProjectDB()
 			return true;
 		if("backup" == $this->chrt_array['tables'][0])
 			return true;
+		if("performance_indicators" == $this->chrt_array['tables'][0])
+			return true;
+		if("performance_tracking" == $this->chrt_array['tables'][0])
+			return true;
+		if("performance_years" == $this->chrt_array['tables'][0])
+			return true;
+		if("" == $this->chrt_array['tables'][0])
+			return true;
 		return false;
 	}
 

diff --git a/app/classes/crosstable_webreport.php b/app/classes/crosstable_webreport.php
@@ -1533,6 +1533,14 @@ public function isProjectDB()
 			$isDB = true;
 		if("backup" == $this->xml_array['tables'][0])
 			$isDB = true;
+		if("performance_indicators" == $this->xml_array['tables'][0])
+			$isDB = true;
+		if("performance_tracking" == $this->xml_array['tables'][0])
+			$isDB = true;
+		if("performance_years" == $this->xml_array['tables'][0])
+			$isDB = true;
+		if("" == $this->xml_array['tables'][0])
+			$isDB = true;
 		return $isDB;
 	}
 

diff --git a/app/classes/db.php b/app/classes/db.php
@@ -394,6 +394,9 @@ protected static function _fillTablesList( $conn )
 			$dalTables[$conn->connId][] = array("name" => "Languages", "varname" => "deredevatderejadevmerqconsulta__Languages", "altvarname" => "Languages", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 			$dalTables[$conn->connId][] = array("name" => "minor_major", "varname" => "deredevatderejadevmerqconsulta__minor_major", "altvarname" => "minor_major", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 			$dalTables[$conn->connId][] = array("name" => "participant_organization_types", "varname" => "deredevatderejadevmerqconsulta__participant_organization_types", "altvarname" => "participant_organization_types", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
+			$dalTables[$conn->connId][] = array("name" => "performance_indicators", "varname" => "deredevatderejadevmerqconsulta__performance_indicators", "altvarname" => "performance_indicators", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
+			$dalTables[$conn->connId][] = array("name" => "performance_tracking", "varname" => "deredevatderejadevmerqconsulta__performance_tracking", "altvarname" => "performance_tracking", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
+			$dalTables[$conn->connId][] = array("name" => "performance_years", "varname" => "deredevatderejadevmerqconsulta__performance_years", "altvarname" => "performance_years", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 			$dalTables[$conn->connId][] = array("name" => "professions", "varname" => "deredevatderejadevmerqconsulta__professions", "altvarname" => "professions", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 			$dalTables[$conn->connId][] = array("name" => "program_areas", "varname" => "deredevatderejadevmerqconsulta__program_areas", "altvarname" => "program_areas", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 			$dalTables[$conn->connId][] = array("name" => "regions", "varname" => "deredevatderejadevmerqconsulta__regions", "altvarname" => "regions", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");

diff --git a/app/classes/projectsettings.php b/app/classes/projectsettings.php
@@ -3662,6 +3662,14 @@ function fillProjectEntites()
 	$projectEntitiesReverse[ "settings" ] = "settings";
 	$projectEntities[ "database_backup" ] = array( "url" => "database_backup", "type" => 1 );
 	$projectEntitiesReverse[ "database_backup" ] = "database_backup";
+	$projectEntities[ "performance_indicators" ] = array( "url" => "performance_indicators", "type" => 0 );
+	$projectEntitiesReverse[ "performance_indicators" ] = "performance_indicators";
+	$projectEntities[ "performance_tracking" ] = array( "url" => "performance_tracking", "type" => 0 );
+	$projectEntitiesReverse[ "performance_tracking" ] = "performance_tracking";
+	$projectEntities[ "performance_years" ] = array( "url" => "performance_years", "type" => 0 );
+	$projectEntitiesReverse[ "performance_years" ] = "performance_years";
+	$projectEntities[ "Performance_Overview" ] = array( "url" => "performance_overview", "type" => 6 );
+	$projectEntitiesReverse[ "performance_overview" ] = "Performance_Overview";
 }
 
 function findTable( $table ) {

diff --git a/app/connections/ConnectionManager_base.php b/app/connections/ConnectionManager_base.php
@@ -317,6 +317,10 @@ protected function _setTablesConnectionIds()
 		$connectionsIds["dereja_academy_lms"] = "deredevatderejadevmerqconsulta";
 		$connectionsIds["settings"] = "deredevatderejadevmerqconsulta";
 		$connectionsIds["database_backup"] = "deredevatderejadevmerqconsulta";
+		$connectionsIds["performance_indicators"] = "deredevatderejadevmerqconsulta";
+		$connectionsIds["performance_tracking"] = "deredevatderejadevmerqconsulta";
+		$connectionsIds["performance_years"] = "deredevatderejadevmerqconsulta";
+		$connectionsIds["Performance_Overview"] = "deredevatderejadevmerqconsulta";
 
 		$this->_tablesConnectionIds = &$connectionsIds;
 	}

diff --git a/app/include/appsettings.php b/app/include/appsettings.php
@@ -751,9 +751,9 @@
 $strLastSQL = "";
 $showCustomMarkerOnPrint = false;
 
-$projectBuildKey = "479_1732109807";
+$projectBuildKey = "488_1732109807";
 $wizardBuildKey = "39558";
-$projectBuildNumber = "479";
+$projectBuildNumber = "488";
 
 $mlang_messages = array();
 $mlang_charsets = array();
@@ -856,6 +856,10 @@
 $tableCaptions["English"]["Home"] = "Home";
 $tableCaptions["English"]["settings"] = "Settings";
 $tableCaptions["English"]["database_backup"] = "Database Backup";
+$tableCaptions["English"]["performance_indicators"] = "Performance Indicators";
+$tableCaptions["English"]["performance_tracking"] = "Performance Tracking";
+$tableCaptions["English"]["performance_years"] = "Performance Years";
+$tableCaptions["English"]["Performance_Overview"] = "Performance Overview";
 
 
 $globalEvents = new class_GlobalEvents;

diff --git a/app/include/audit.php b/app/include/audit.php
@@ -712,6 +712,22 @@ function logValueEnable($table)
 		{
 			return true;
 		}
+		if($table=="performance_indicators")
+		{
+			return false;
+		}
+		if($table=="performance_tracking")
+		{
+			return false;
+		}
+		if($table=="performance_years")
+		{
+			return false;
+		}
+		if($table=="Performance_Overview")
+		{
+			return false;
+		}
 	}
 
 	protected function insert($datetime, $ip, $user, $table, $action, $description)
@@ -1378,6 +1394,22 @@ function logValueEnable($table)
 		{
 			return true;
 		}
+		if($table=="performance_indicators")
+		{
+			return false;
+		}
+		if($table=="performance_tracking")
+		{
+			return false;
+		}
+		if($table=="performance_years")
+		{
+			return false;
+		}
+		if($table=="Performance_Overview")
+		{
+			return false;
+		}
 	}
 
 	protected function getMaxLengthSubstr( $value )

diff --git a/app/include/commonfunctions.php b/app/include/commonfunctions.php
@@ -355,6 +355,14 @@ function checkTableName($shortTName )
 		return true;
 	if ("database_backup" == $shortTName )
 		return true;
+	if ("performance_indicators" == $shortTName )
+		return true;
+	if ("performance_tracking" == $shortTName )
+		return true;
+	if ("performance_years" == $shortTName )
+		return true;
+	if ("performance_overview" == $shortTName )
+		return true;
 	return false;
 }
 
@@ -1089,6 +1097,42 @@ function GetTablesList($pdfMode = false)
 	if( $tableAvailable ) {
 		$arr[]="database_backup";
 	}
+	$tableAvailable = true;
+	if( $checkPermissions ) {
+		$strPerm = GetUserPermissions("performance_indicators");
+		$tableAvailable = ( strpos($strPerm, "P") !== false
+			|| $pdfMode && strpos($strPerm, "S") !== false );
+	}
+	if( $tableAvailable ) {
+		$arr[]="performance_indicators";
+	}
+	$tableAvailable = true;
+	if( $checkPermissions ) {
+		$strPerm = GetUserPermissions("performance_tracking");
+		$tableAvailable = ( strpos($strPerm, "P") !== false
+			|| $pdfMode && strpos($strPerm, "S") !== false );
+	}
+	if( $tableAvailable ) {
+		$arr[]="performance_tracking";
+	}
+	$tableAvailable = true;
+	if( $checkPermissions ) {
+		$strPerm = GetUserPermissions("performance_years");
+		$tableAvailable = ( strpos($strPerm, "P") !== false
+			|| $pdfMode && strpos($strPerm, "S") !== false );
+	}
+	if( $tableAvailable ) {
+		$arr[]="performance_years";
+	}
+	$tableAvailable = true;
+	if( $checkPermissions ) {
+		$strPerm = GetUserPermissions("Performance_Overview");
+		$tableAvailable = ( strpos($strPerm, "P") !== false
+			|| $pdfMode && strpos($strPerm, "S") !== false );
+	}
+	if( $tableAvailable ) {
+		$arr[]="Performance_Overview";
+	}
 	return $arr;
 }
 
@@ -1174,6 +1218,10 @@ function GetTablesListWithoutSecurity()
 	$arr[]="Home";
 	$arr[]="settings";
 	$arr[]="database_backup";
+	$arr[]="performance_indicators";
+	$arr[]="performance_tracking";
+	$arr[]="performance_years";
+	$arr[]="Performance_Overview";
 	return $arr;
 }
 
@@ -2192,6 +2240,26 @@ function GetUserPermissionsStatic( $table )
 	}
 	if( $table=="database_backup" )
 	{
+//	default permissions
+		return "ADESPI".$extraPerm;
+	}
+	if( $table=="performance_indicators" )
+	{
+//	default permissions
+		return "ADESPI".$extraPerm;
+	}
+	if( $table=="performance_tracking" )
+	{
+//	default permissions
+		return "ADESPI".$extraPerm;
+	}
+	if( $table=="performance_years" )
+	{
+//	default permissions
+		return "ADESPI".$extraPerm;
+	}
+	if( $table=="Performance_Overview" )
+	{
 //	default permissions
 		return "ADESPI".$extraPerm;
 	}

diff --git a/app/include/dal.php b/app/include/dal.php
@@ -87,6 +87,9 @@ class tDAL
 	var $tblderedevatderejadevmerqconsulta__Languages;
 	var $tblderedevatderejadevmerqconsulta__minor_major;
 	var $tblderedevatderejadevmerqconsulta__participant_organization_types;
+	var $tblderedevatderejadevmerqconsulta__performance_indicators;
+	var $tblderedevatderejadevmerqconsulta__performance_tracking;
+	var $tblderedevatderejadevmerqconsulta__performance_years;
 	var $tblderedevatderejadevmerqconsulta__professions;
 	var $tblderedevatderejadevmerqconsulta__program_areas;
 	var $tblderedevatderejadevmerqconsulta__regions;
@@ -155,6 +158,9 @@ function FillTablesList()
 		$this->lstTables[] = array("name" => "Languages", "varname" => "deredevatderejadevmerqconsulta__Languages", "altvarname" => "Languages", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 		$this->lstTables[] = array("name" => "minor_major", "varname" => "deredevatderejadevmerqconsulta__minor_major", "altvarname" => "minor_major", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 		$this->lstTables[] = array("name" => "participant_organization_types", "varname" => "deredevatderejadevmerqconsulta__participant_organization_types", "altvarname" => "participant_organization_types", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
+		$this->lstTables[] = array("name" => "performance_indicators", "varname" => "deredevatderejadevmerqconsulta__performance_indicators", "altvarname" => "performance_indicators", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
+		$this->lstTables[] = array("name" => "performance_tracking", "varname" => "deredevatderejadevmerqconsulta__performance_tracking", "altvarname" => "performance_tracking", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
+		$this->lstTables[] = array("name" => "performance_years", "varname" => "deredevatderejadevmerqconsulta__performance_years", "altvarname" => "performance_years", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 		$this->lstTables[] = array("name" => "professions", "varname" => "deredevatderejadevmerqconsulta__professions", "altvarname" => "professions", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 		$this->lstTables[] = array("name" => "program_areas", "varname" => "deredevatderejadevmerqconsulta__program_areas", "altvarname" => "program_areas", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");
 		$this->lstTables[] = array("name" => "regions", "varname" => "deredevatderejadevmerqconsulta__regions", "altvarname" => "regions", "connId" => "deredevatderejadevmerqconsulta", "schema" => "", "connName" => "dere_dev at derejadev.merqcons");

diff --git a/app/include/dal/deredevatderejadevmerqconsulta__performance_indicators.php b/app/include/dal/deredevatderejadevmerqconsulta__performance_indicators.php
@@ -0,0 +1,10 @@
+<?php
+$dalTableperformance_indicators = array();
+$dalTableperformance_indicators["indicator_id"] = array("type"=>3,"varname"=>"indicator_id", "name" => "indicator_id", "autoInc" => "1");
+$dalTableperformance_indicators["indicator_name"] = array("type"=>200,"varname"=>"indicator_name", "name" => "indicator_name", "autoInc" => "0");
+$dalTableperformance_indicators["unit_of_measurement"] = array("type"=>200,"varname"=>"unit_of_measurement", "name" => "unit_of_measurement", "autoInc" => "0");
+$dalTableperformance_indicators["reporting_frequency"] = array("type"=>200,"varname"=>"reporting_frequency", "name" => "reporting_frequency", "autoInc" => "0");
+$dalTableperformance_indicators["indicator_id"]["key"]=true;
+
+$dal_info["deredevatderejadevmerqconsulta__performance_indicators"] = &$dalTableperformance_indicators;
+?>
diff --git a/app/include/dal/deredevatderejadevmerqconsulta__performance_tracking.php b/app/include/dal/deredevatderejadevmerqconsulta__performance_tracking.php
@@ -0,0 +1,10 @@
+<?php
+$dalTableperformance_tracking = array();
+$dalTableperformance_tracking["tracking_id"] = array("type"=>3,"varname"=>"tracking_id", "name" => "tracking_id", "autoInc" => "1");
+$dalTableperformance_tracking["indicator_id"] = array("type"=>3,"varname"=>"indicator_id", "name" => "indicator_id", "autoInc" => "0");
+$dalTableperformance_tracking["baseline_year"] = array("type"=>2,"varname"=>"baseline_year", "name" => "baseline_year", "autoInc" => "0");
+$dalTableperformance_tracking["baseline_value"] = array("type"=>14,"varname"=>"baseline_value", "name" => "baseline_value", "autoInc" => "0");
+$dalTableperformance_tracking["tracking_id"]["key"]=true;
+
+$dal_info["deredevatderejadevmerqconsulta__performance_tracking"] = &$dalTableperformance_tracking;
+?>
diff --git a/app/include/dal/deredevatderejadevmerqconsulta__performance_years.php b/app/include/dal/deredevatderejadevmerqconsulta__performance_years.php
@@ -0,0 +1,11 @@
+<?php
+$dalTableperformance_years = array();
+$dalTableperformance_years["id"] = array("type"=>3,"varname"=>"id", "name" => "id", "autoInc" => "1");
+$dalTableperformance_years["tracking_id"] = array("type"=>3,"varname"=>"tracking_id", "name" => "tracking_id", "autoInc" => "0");
+$dalTableperformance_years["year"] = array("type"=>2,"varname"=>"year", "name" => "year", "autoInc" => "0");
+$dalTableperformance_years["target"] = array("type"=>14,"varname"=>"target", "name" => "target", "autoInc" => "0");
+$dalTableperformance_years["actual"] = array("type"=>14,"varname"=>"actual", "name" => "actual", "autoInc" => "0");
+$dalTableperformance_years["id"]["key"]=true;
+
+$dal_info["deredevatderejadevmerqconsulta__performance_years"] = &$dalTableperformance_years;
+?>