updated main candidates pages and menu items

MIKEINTOSHSYSTEMS · May 30, 2024 · 4ba6f6b · 4ba6f6b
1 parent 68f7988
commit 4ba6f6b
Show file tree

Hide file tree

Showing 65 changed files with 36,384 additions and 9,514 deletions.
diff --git a/app/include/appsettings.php b/app/include/appsettings.php
@@ -744,9 +744,9 @@
 $strLastSQL = "";
 $showCustomMarkerOnPrint = false;
 
-$projectBuildKey = "349_1717005092";
+$projectBuildKey = "360_1717069812";
 $wizardBuildKey = "39558";
-$projectBuildNumber = "349";
+$projectBuildNumber = "360";
 
 $mlang_messages = array();
 $mlang_charsets = array();

diff --git a/app/include/candidates_aggrigated_settings.php b/app/include/candidates_aggrigated_settings.php
@@ -9555,6 +9555,8 @@ function createSqlQuery_candidates_aggrigated()
 $proto129["m_columns"][] = "City";
 $proto129["m_columns"][] = "Sub_City";
 $proto129["m_columns"][] = "Zone";
+$proto129["m_columns"][] = "Woreda";
+$proto129["m_columns"][] = "Kebele";
 $proto129["m_columns"][] = "House_No";
 $proto129["m_columns"][] = "Phone_Number";
 $proto129["m_columns"][] = "Phone_Number_Alternate";
@@ -9599,7 +9601,12 @@ function createSqlQuery_candidates_aggrigated()
 $proto129["m_columns"][] = "Dereja_Information_Source";
 $proto129["m_columns"][] = "Employment_Status";
 $proto129["m_columns"][] = "Employment_Company";
+$proto129["m_columns"][] = "Employer_Sector";
 $proto129["m_columns"][] = "Employment_Position";
+$proto129["m_columns"][] = "Salary";
+$proto129["m_columns"][] = "Career_Level_Of_Payment";
+$proto129["m_columns"][] = "Placement_Type";
+$proto129["m_columns"][] = "Placement_Duration";
 $proto129["m_columns"][] = "Remark";
 $obj = new SQLTable($proto129);
 

diff --git a/app/include/candidates_by_gender_settings.php b/app/include/candidates_by_gender_settings.php
@@ -10347,6 +10347,8 @@ function createSqlQuery_candidates_by_gender()
 $proto121["m_columns"][] = "City";
 $proto121["m_columns"][] = "Sub_City";
 $proto121["m_columns"][] = "Zone";
+$proto121["m_columns"][] = "Woreda";
+$proto121["m_columns"][] = "Kebele";
 $proto121["m_columns"][] = "House_No";
 $proto121["m_columns"][] = "Phone_Number";
 $proto121["m_columns"][] = "Phone_Number_Alternate";
@@ -10391,7 +10393,12 @@ function createSqlQuery_candidates_by_gender()
 $proto121["m_columns"][] = "Dereja_Information_Source";
 $proto121["m_columns"][] = "Employment_Status";
 $proto121["m_columns"][] = "Employment_Company";
+$proto121["m_columns"][] = "Employer_Sector";
 $proto121["m_columns"][] = "Employment_Position";
+$proto121["m_columns"][] = "Salary";
+$proto121["m_columns"][] = "Career_Level_Of_Payment";
+$proto121["m_columns"][] = "Placement_Type";
+$proto121["m_columns"][] = "Placement_Duration";
 $proto121["m_columns"][] = "Remark";
 $obj = new SQLTable($proto121);
 

diff --git a/app/include/candidates_by_region_settings.php b/app/include/candidates_by_region_settings.php
@@ -10357,6 +10357,8 @@ function createSqlQuery_candidates_by_region()
 $proto121["m_columns"][] = "City";
 $proto121["m_columns"][] = "Sub_City";
 $proto121["m_columns"][] = "Zone";
+$proto121["m_columns"][] = "Woreda";
+$proto121["m_columns"][] = "Kebele";
 $proto121["m_columns"][] = "House_No";
 $proto121["m_columns"][] = "Phone_Number";
 $proto121["m_columns"][] = "Phone_Number_Alternate";
@@ -10401,7 +10403,12 @@ function createSqlQuery_candidates_by_region()
 $proto121["m_columns"][] = "Dereja_Information_Source";
 $proto121["m_columns"][] = "Employment_Status";
 $proto121["m_columns"][] = "Employment_Company";
+$proto121["m_columns"][] = "Employer_Sector";
 $proto121["m_columns"][] = "Employment_Position";
+$proto121["m_columns"][] = "Salary";
+$proto121["m_columns"][] = "Career_Level_Of_Payment";
+$proto121["m_columns"][] = "Placement_Type";
+$proto121["m_columns"][] = "Placement_Duration";
 $proto121["m_columns"][] = "Remark";
 $obj = new SQLTable($proto121);
 

diff --git a/app/include/candidates_by_sex_age_disability_settings.php b/app/include/candidates_by_sex_age_disability_settings.php
@@ -1071,6 +1071,8 @@ function createSqlQuery_candidates_by_sex_age_disability()
 $proto18["m_columns"][] = "City";
 $proto18["m_columns"][] = "Sub_City";
 $proto18["m_columns"][] = "Zone";
+$proto18["m_columns"][] = "Woreda";
+$proto18["m_columns"][] = "Kebele";
 $proto18["m_columns"][] = "House_No";
 $proto18["m_columns"][] = "Phone_Number";
 $proto18["m_columns"][] = "Phone_Number_Alternate";
@@ -1115,7 +1117,12 @@ function createSqlQuery_candidates_by_sex_age_disability()
 $proto18["m_columns"][] = "Dereja_Information_Source";
 $proto18["m_columns"][] = "Employment_Status";
 $proto18["m_columns"][] = "Employment_Company";
+$proto18["m_columns"][] = "Employer_Sector";
 $proto18["m_columns"][] = "Employment_Position";
+$proto18["m_columns"][] = "Salary";
+$proto18["m_columns"][] = "Career_Level_Of_Payment";
+$proto18["m_columns"][] = "Placement_Type";
+$proto18["m_columns"][] = "Placement_Duration";
 $proto18["m_columns"][] = "Remark";
 $obj = new SQLTable($proto18);
 

diff --git a/app/include/candidates_grouped_report_settings.php b/app/include/candidates_grouped_report_settings.php
@@ -10078,6 +10078,8 @@ function createSqlQuery_candidates_grouped_report()
 $proto127["m_columns"][] = "City";
 $proto127["m_columns"][] = "Sub_City";
 $proto127["m_columns"][] = "Zone";
+$proto127["m_columns"][] = "Woreda";
+$proto127["m_columns"][] = "Kebele";
 $proto127["m_columns"][] = "House_No";
 $proto127["m_columns"][] = "Phone_Number";
 $proto127["m_columns"][] = "Phone_Number_Alternate";
@@ -10122,7 +10124,12 @@ function createSqlQuery_candidates_grouped_report()
 $proto127["m_columns"][] = "Dereja_Information_Source";
 $proto127["m_columns"][] = "Employment_Status";
 $proto127["m_columns"][] = "Employment_Company";
+$proto127["m_columns"][] = "Employer_Sector";
 $proto127["m_columns"][] = "Employment_Position";
+$proto127["m_columns"][] = "Salary";
+$proto127["m_columns"][] = "Career_Level_Of_Payment";
+$proto127["m_columns"][] = "Placement_Type";
+$proto127["m_columns"][] = "Placement_Duration";
 $proto127["m_columns"][] = "Remark";
 $obj = new SQLTable($proto127);
 

diff --git a/app/include/candidates_reports_settings.php b/app/include/candidates_reports_settings.php
@@ -10361,6 +10361,8 @@ function createSqlQuery_candidates_reports()
 $proto121["m_columns"][] = "City";
 $proto121["m_columns"][] = "Sub_City";
 $proto121["m_columns"][] = "Zone";
+$proto121["m_columns"][] = "Woreda";
+$proto121["m_columns"][] = "Kebele";
 $proto121["m_columns"][] = "House_No";
 $proto121["m_columns"][] = "Phone_Number";
 $proto121["m_columns"][] = "Phone_Number_Alternate";
@@ -10405,7 +10407,12 @@ function createSqlQuery_candidates_reports()
 $proto121["m_columns"][] = "Dereja_Information_Source";
 $proto121["m_columns"][] = "Employment_Status";
 $proto121["m_columns"][] = "Employment_Company";
+$proto121["m_columns"][] = "Employer_Sector";
 $proto121["m_columns"][] = "Employment_Position";
+$proto121["m_columns"][] = "Salary";
+$proto121["m_columns"][] = "Career_Level_Of_Payment";
+$proto121["m_columns"][] = "Placement_Type";
+$proto121["m_columns"][] = "Placement_Duration";
 $proto121["m_columns"][] = "Remark";
 $obj = new SQLTable($proto121);