attendance actuals report

agabaandre · Aug 1, 2022 · 1586fde · 1586fde
1 parent eebfd10
commit 1586fde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/application/modules/rosta/controllers/Rosta.php b/application/modules/rosta/controllers/Rosta.php
@@ -902,17 +902,17 @@ public function attfrom_report()
 		$data['facilities'] = Modules::run("facilities/getFacilities");
 		$empid = $this->input->post('empid');
 		$data['duties'] = $this->rosta_model->fetch_report($date, $config['per_page'], $page, $empid, $this->filters);
-		$data['actualrows'] = $this->rosta_model->getActuals($date, $this->filters);
+		$actualrows = $this->rosta_model->getActuals($date, $this->filters);
 		$actuals = array();
 
 		//print_r($data['duties']);
-		// foreach ($actualrows as $actual) {
+		foreach ($actualrows as $actual) {
 
-		// 	$entry = $actual['entry_id'];
-		// 	$duty = $actual['actual'];
+			$entry = $actual['entry_id'];
+			$duty = $actual['actual'];
 
-		// 	$actuals[$entry] = $duty;
-		// }
+			$actuals[$entry] = $duty;
+		}
 
 
 		$data['actuals'] = $actuals;

diff --git a/application/modules/rosta/views/attendance_form_report.php b/application/modules/rosta/views/attendance_form_report.php
@@ -230,9 +230,7 @@ function dayState($day, $scheduled)
 									//$nonworkables contains non duty days
 									//$workeddays contains  worked days
 
-									foreach ($actualrows as $singleduty) {
-
-										print($actualrows);
+									foreach ($duties as $singleduty) {
 
 										$no++;