From f715eba1d7cd92c21afa501e2be07eddfae94e8f Mon Sep 17 00:00:00 2001
From: David Slater <dslater@illinois.edu>
Date: Thu, 10 Oct 2024 11:12:15 -0500
Subject: [PATCH] Starting fixing fbs reports

---
 conf/settings.inc.php.dist        |  5 +++++
 html/report.php                   | 10 +++++++--
 html/stats_monthly.php            |  4 ++--
 libs/data_functions.class.inc.php | 13 +++++++----
 libs/job_functions.class.inc.php  | 14 ++++++++----
 libs/settings.class.inc.php       | 36 +++++++++++++++++++++++++++++++
 6 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/conf/settings.inc.php.dist b/conf/settings.inc.php.dist
index 8a3b7c6..dd3ce5d 100644
--- a/conf/settings.inc.php.dist
+++ b/conf/settings.inc.php.dist
@@ -57,5 +57,10 @@ define('CFOP_API_KEY','');
 define('FBS_ACCESS_KEY','');
 define('FBS_SECRET_KEY','');
 define('FBS_FACILITY_ID','');
+define('FBS_FACILITY_CODE','');
+define('FBS_AREACODE','');
+define('FBS_LABCODE','');
+define('FBS_JOBS_SKUCODE','');
+define('FBS_DATA_SKUCODE','');
 
 ?>
diff --git a/html/report.php b/html/report.php
index 48a50c3..2d9491a 100644
--- a/html/report.php
+++ b/html/report.php
@@ -41,7 +41,10 @@
         $month = $_POST['month'];
         $year = $_POST['year'];
         $type = $_POST['report_type'];
-        $data = job_functions::get_jobs_fbs_bill($db,$month,$year);
+        $data = job_functions::get_jobs_fbs_bill($db,$month,$year,
+		settings::get_fbs_areacode(),settings::get_fbs_facility_code(),
+		settings::get_fbs_labcode(),settings::get_fbs_jobs_skucode()
+	);
         $filename = $prefix . "-job-fbs-" . $month . "-" . $year . "." . $type;
 
 
@@ -78,7 +81,10 @@
 	$month = $_POST['month'];
         $year = $_POST['year'];
         $type = $_POST['report_type'];
-        $data = data_functions::get_data_fbs_bill($db,$month,$year,settings::get_data_minimal_bill());
+        $data = data_functions::get_data_fbs_bill($db,$month,$year,settings::get_data_minimal_bill(),
+		settings::get_fbs_areacode(),settings::get_fbs_facility_code(),settings::get_fbs_labcode(),
+		settings::get_fbs_data_skucode()
+	);
         $filename = $prefix . "-data-fbs-" . $month . "-" . $year . "." . $type;
 
 
diff --git a/html/stats_monthly.php b/html/stats_monthly.php
index 9dd3b63..abc452b 100644
--- a/html/stats_monthly.php
+++ b/html/stats_monthly.php
@@ -65,7 +65,7 @@
 $graph_image = "<img src='graph.php?" . http_build_query($get_array) . "'>";
 
 
-$graph_form = "<form class='form-inline' name='select_graph' id='select_graph' method='post' action='" . $_SERVER['PHP_SELF'];
+$graph_form = "<form name='select_graph' id='select_graph' method='post' action='" . $_SERVER['PHP_SELF'];
 $graph_form .= "?year=" . $selected_month->format("Y") . "&month=" . $selected_month->format("m") . "'>";
 $graph_form .= "<select class='form-select' name='graph_type' onChange='document.select_graph.submit();'>";
 
@@ -148,7 +148,7 @@
                 	<td>$<?php echo data_stats::get_billed_cost($db,$selected_month,$selected_month,true); ?></td>
 	        </tr>
 		<tr>
-			<td colspan='2'><?php echo $graph_form; ?></td>
+			<td colspan='2'><div class='col-sm-2'><?php echo $graph_form; ?></div></td>
 		</tr>
 		<tr>
 			<td colspan='2'><?php echo $graph_image; ?></td>
diff --git a/libs/data_functions.class.inc.php b/libs/data_functions.class.inc.php
index 604f47d..9667dc2 100644
--- a/libs/data_functions.class.inc.php
+++ b/libs/data_functions.class.inc.php
@@ -138,12 +138,13 @@ public static function get_data_custom_bill($db,$month,$year,$minimal_bill = 0.0
 		return $data_result;
         }
 
-	public static function get_data_fbs_bill($db,$month,$year,$minimal_bill = 0.01) {
-		$sql = "SELECT 'IGB' as 'AreaCode','CNRG' as 'FacilityCode', ";
-		$sql .= "'' as 'LabCode', IF(users.user_supervisor <> 0,CONCAT(supervisors.user_lastname,', ',supervisors.user_firstname),CONCAT(users.user_lastname,', ',users.user_firstname)) as 'LabName',  ";
+	public static function get_data_fbs_bill($db,$month,$year,$minimal_bill = 0.01,$fbs_areacode,$fbs_facilitycode,$fbs_labcode,$fbs_data_skucode) {
+		$sql = "SELECT :fbs_areacode as 'AreaCode',:fbs_facilitycode as 'FacilityCode', ";
+		$sql .= ":fbs_labcode as 'LabCode', IF(users.user_supervisor <> 0,CONCAT(supervisors.user_lastname,', ',supervisors.user_firstname), ";
+		$sql .= "CONCAT(users.user_lastname,', ',users.user_firstname)) as 'LabName',  ";
 		$sql .= "CONCAT(users.user_firstname,users.user_lastname) as 'RequestedBy', ";
 		$sql .= "users.user_name as 'NAME', CONCAT(cfops.cfop_value,IF(cfops.cfop_activity <> '','-',''),cfops.cfop_activity) as 'CFOP', ";
-		$sql .= "'BIOCLUSTER' as 'SKU_Code', CONCAT(:month,'-',:year) as 'UsageDate', ";
+		$sql .= ":fbs_data_skucode as 'SKU_Code', CONCAT(:month,'-',:year) as 'UsageDate', ";
 		$sql .= "'1.000' as 'Quantity', ROUND(data_bill.data_bill_billed_cost,2) as 'UnitPriceOverride', ";
 		$sql .= "CONCAT('Biocluster Data - ',SUBSTRING_INDEX(data_dir.data_dir_path,'/',-1)) as 'PrintableComments', ";
 		$sql .= "'' as 'UsageRef', '' as 'OrderRef', '' as 'PO_Ref','' as 'PayAlias', ";
@@ -162,6 +163,10 @@ public static function get_data_fbs_bill($db,$month,$year,$minimal_bill = 0.01)
                 $sql .= "ORDER BY LabName ASC";
 
                 $parameters = array(
+			':fbs_areacode'=>$fbs_areacode,
+			':fbs_facilitycode'=>$fbs_facilitycode,
+			':fbs_data_skucode'=>$fbs_data_skucode,
+			':fbs_labcode'=>$fbs_labcode,
                         ':month'=>$month,
                         ':year'=>$year,
                         ':terabytes'=>data_functions::CONVERT_TERABYTES,
diff --git a/libs/job_functions.class.inc.php b/libs/job_functions.class.inc.php
index cb42ef7..e18da79 100644
--- a/libs/job_functions.class.inc.php
+++ b/libs/job_functions.class.inc.php
@@ -69,12 +69,14 @@ public static function get_all_jobs_by_month($db,$month,$year) {
 
         }
 
-	public static function get_jobs_fbs_bill($db,$month,$year) {
-                $sql = "SELECT 'IGB' as 'AreaCode','CNRG' as 'FacilityCode', ";
-                $sql .= "'' as 'LabCode', IF(users.user_supervisor <> 0,CONCAT(supervisors.user_lastname,', ',supervisors.user_firstname),CONCAT(users.user_lastname,', ',users.user_firstname)) as 'LabName',  ";
+	public static function get_jobs_fbs_bill($db,$month,$year,$fbs_areacode,$fbs_facilitycode,$fbs_labcode,$fbs_job_skucode) {
+                $sql = "SELECT :fbs_areacode as 'AreaCode',:fbs_facilitycode as 'FacilityCode', ";
+		$sql .= "CONCAT(:month,'-',:year) as 'UsageDate', ";
+                $sql .= ":fbs_labcode as 'LabCode', IF(users.user_supervisor <> 0,CONCAT(supervisors.user_lastname,' ',supervisors.user_firstname),";
+		$sql .= "CONCAT(users.user_lastname,', ',users.user_firstname)) as 'LabName',  ";
                 $sql .= "CONCAT(users.user_firstname,users.user_lastname) as 'RequestedBy', ";
+		$sql .= ":fbs_job_skucode as 'SKU_Code', ";
                 $sql .= "users.user_name as 'NAME', CONCAT(cfops.cfop_value,IF(cfops.cfop_activity <> '','-',''),cfops.cfop_activity) as 'CFOP', ";
-                $sql .= "'BIOCLUSTER' as 'SKU_Code', CONCAT(:month,'-',:year) as 'UsageDate', ";
                 $sql .= "'1.000' as 'Quantity', ROUND(SUM(job_bill.job_bill_billed_cost),2) as 'UnitPriceOverride', ";
                 $sql .= "CONCAT('Biocluster Jobs - ',users.user_name) as 'PrintableComments', ";
                 $sql .= "'' as 'UsageRef', '' as 'OrderRef', '' as 'PO_Ref','' as 'PayAlias', ";
@@ -90,6 +92,10 @@ public static function get_jobs_fbs_bill($db,$month,$year) {
 		$sql .= "GROUP BY job_bill.job_bill_user_id ";
                 $sql .= "ORDER BY LabName ASC";
                 $parameters = array(
+			':fbs_areacode'=>$fbs_areacode,
+			':fbs_facilitycode'=>$fbs_facilitycode,
+			':fbs_labcode'=>$fbs_labcode,
+			':fbs_job_skucode'=>$fbs_job_skucode,
                         ':month'=>$month,
                         ':year'=>$year,
                         ':billtype'=>project::BILLTYPE_CFOP
diff --git a/libs/settings.class.inc.php b/libs/settings.class.inc.php
index bd22045..65a74a2 100644
--- a/libs/settings.class.inc.php
+++ b/libs/settings.class.inc.php
@@ -323,6 +323,42 @@ public static function get_fbs_facility_id() {
 		return false;
 
 	}
+
+	public static function get_fbs_facility_code() {
+		if (defined("FBS_FACILITY_CODE")) {
+			return FBS_FACILITY_CODE;
+		}
+		return "";
+
+	}
+	public static function get_fbs_areacode() {
+		if (defined("FBS_AREACODE")) {
+			return FBS_AREACODE;
+		}
+		return "";
+
+	}
+	public static function get_fbs_labcode() {
+		if (defined("FBS_LABCODE")) {
+			return FBS_LABCODE;
+		}
+		return "";
+	}
+
+	public static function get_fbs_jobs_skucode() {
+		if (defined("FBS_JOBS_SKUCODE")) {
+			return FBS_JOBS_SKUCODE;
+		}
+		return "";
+	}
+
+	public static function get_fbs_data_skucode() {
+		if (defined("FBS_DATA_SKUCODE")) {
+			return FBS_DATA_SKUCODE;
+		}
+		return "";
+
+	}
 }
 
 ?>