- updated the file header to describe the actual two-mode flow

 - removed the unused appraisal frequency query and variable
 - replaced the stale inline comment that still referred to Edit=Yes with one that matches the current shared-field structure

Files changed in commit:
HRAppraisalEntry.php
HRPerformanceAppraisals.php

Author: timschofield

HRAppraisalEntry.php

@@ -4,12 +4,11 @@
  * Performance Appraisal Entry/Edit
  *
  * Allows HR managers to create new performance appraisals for employees
- * and edit existing appraisal records. Three URL modes are supported:
+ * and edit existing appraisal records. The script has two modes:
  *
- *   (no params)               -- blank form to create a new appraisal
- *   AppraisalID=N&Edit=Yes    -- edit form pre-filled from the database
- *   AppraisalID=N             -- read-only view with a link to switch to edit
- *   AppraisalID=N&Delete=1    -- delete the appraisal and redirect
+ *   (no params)         -- blank form to create a new appraisal
+ *   AppraisalID=N       -- edit form pre-filled from the database
+ *   AppraisalID=N&Delete=1 -- delete the appraisal and redirect
  */
 
 require(__DIR__ . '/includes/session.php');
@@ -38,17 +37,6 @@
 /* Edit mode: an AppraisalID is present in the URL */
 $EditMode = (isset($_GET['AppraisalID']) AND (int)$_GET['AppraisalID'] > 0);
 
-/* Get appraisal frequency from system options */
-$SQL = "SELECT optionvalue
-	FROM hrsystemoptions
-	WHERE optionname = 'AppraisalFrequency'";
-$OptionsResult  = DB_query($SQL);
-$AppraisalFrequency = 365;
-if (DB_num_rows($OptionsResult) > 0) {
-	$OptionRow          = DB_fetch_array($OptionsResult);
-	$AppraisalFrequency = $OptionRow['optionvalue'];
-}
-
 /* Handle form submission (both new and edit) */
 if (isset($_POST['Submit'])) {
 
@@ -275,7 +263,7 @@
 
 /*
  * Edit appraisal section: fields pre-filled from the database.
- * Only rendered when AppraisalID and Edit=Yes are both present in the URL.
+ * Shared fields below use the $Db-prefixed variables loaded above.
  */
 
 echo '<field>

HRPerformanceAppraisals.php

@@ -10,6 +10,15 @@
 
 include(__DIR__ . '/includes/header.php');
 
+/* Rating labels for hrperfappraisals.overallrating (INT 1-5) */
+$RatingLabels = array(
+	5 => __('Outstanding'),
+	4 => __('Exceeds Expectations'),
+	3 => __('Meets Expectations'),
+	2 => __('Needs Improvement'),
+	1 => __('Unsatisfactory'),
+);
+
 // Get system options
 $SQL = "SELECT optionname, optionvalue FROM hrsystemoptions WHERE optionname = 'AppraisalFrequency'";
 $OptionsResult = DB_query($SQL);
@@ -19,6 +28,8 @@
 	$AppraisalFrequency = $OptionRow['optionvalue'];
 }
 
+echo '<a class="toplink" href="' . $RootPath . '/HRAppraisalEntry.php">' . __('Create New Appraisal') . '</a>';
+
 echo '<p class="page_title_text">
 		<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/star.png" title="' . __('Performance Appraisals') . '" /> ' .
 		__('Performance Appraisals Management') . '
@@ -97,8 +108,6 @@
 
 $Result = DB_query($SQL);
 
-echo '<a class="toplink" href="' . $RootPath . '/HRAppraisalEntry.php">' . __('Create New Appraisal') . '</a>';
-
 echo '<table class="selection">
 		<thead>
 			<tr>
@@ -116,7 +125,7 @@
 				<th>' . __('Status') . '</th>
 				<th>' . __('Rating') . '</th>
 				<th>' . __('Manager') . '</th>
-				<th>' . __('Actions') . '</th>
+				<th></th>
 			</tr>
 		</thead>
 		<tbody>';
@@ -136,11 +145,10 @@
 				<td>' . ConvertSQLDate($MyRow['reviewperiodstart']) . ' - ' . ConvertSQLDate($MyRow['reviewperiodend']) . '</td>
 				<td>' . ConvertSQLDate($MyRow['duedate']) . '</td>
 				<td>' . htmlspecialchars($MyRow['status'], ENT_QUOTES, 'UTF-8') . '</td>
-				<td>' . ($MyRow['overallrating'] ? htmlspecialchars($MyRow['overallrating'], ENT_QUOTES, 'UTF-8') : '-') . '</td>
+				<td>' . (isset($RatingLabels[$MyRow['overallrating']]) ? htmlspecialchars($RatingLabels[$MyRow['overallrating']], ENT_QUOTES, 'UTF-8') : '-') . '</td>
 				<td>' . htmlspecialchars($MyRow['managername'], ENT_QUOTES, 'UTF-8') . '</td>
 				<td class="centre">
-					<a href="' . $RootPath . '/HRAppraisalEntry.php?AppraisalID=' . urlencode($MyRow['appraisalid']) . '">' . __('Edit') . '</a> |
-					<a href="' . $RootPath . '/HRAppraisalEntry.php?AppraisalID=' . urlencode($MyRow['appraisalid']) . '&View=1">' . __('View') . '</a>
+					<a href="' . $RootPath . '/HRAppraisalEntry.php?AppraisalID=' . urlencode($MyRow['appraisalid']) . '">' . __('Edit') . '</a>
 				</td>
 			</tr>';
 	}