浏览代码

Add support for specifying time of day for projects

Alan Lam 8 年之前
父节点
当前提交
c209ee17ae
共有 4 个文件被更改,包括 28 次插入 和 1 次删除
  1. 3 0
      controllers/project_add.php
  2. 3 0
      controllers/project_edit.php
  3. 1 1
      engine/project.php
  4. 21 0
      views/project_form.php

+ 3 - 0
controllers/project_add.php

@@ -38,6 +38,7 @@ if($submit) {
 		$project->min_age = http::value("min_age", "int");
 		$project->min_age = http::value("min_age", "int");
 		$project->max_age = http::value("max_age", "int");
 		$project->max_age = http::value("max_age", "int");
 		$project->default_tester_fee = http::value("default_tester_fee", "float");
 		$project->default_tester_fee = http::value("default_tester_fee", "float");
+		$project->time_of_day = http::value("time_of_day", "trim");
 
 
 		$date_start = http::getDateFromFields("date_start");
 		$date_start = http::getDateFromFields("date_start");
 		$date_deadline = http::getDateFromFields("date_deadline");
 		$date_deadline = http::getDateFromFields("date_deadline");
@@ -55,6 +56,8 @@ if($submit) {
 		if(empty($project->min_age)) $form_exception->addError("Minimum age is required.");
 		if(empty($project->min_age)) $form_exception->addError("Minimum age is required.");
 		if(empty($project->max_age)) $form_exception->addError("Maximum age is required.");
 		if(empty($project->max_age)) $form_exception->addError("Maximum age is required.");
 		if(empty($project->default_tester_fee)) $form_exception->addError("Default tester fee is required.");
 		if(empty($project->default_tester_fee)) $form_exception->addError("Default tester fee is required.");
+		if(empty($project->time_of_day)) $form_exception->addError("Time of day is required.");
+		else if(!in_array($project->time_of_day, ["A", "D", "N"])) $form_exception->addError("Invalid time of day selected.");
 		if(empty($date_start)) $form_exception->addError("Start Date is required.");
 		if(empty($date_start)) $form_exception->addError("Start Date is required.");
 		if(empty($date_deadline)) $form_exception->addError("Deadline is required.");
 		if(empty($date_deadline)) $form_exception->addError("Deadline is required.");
 		if($project->min_age > $project->max_age) $form_exception->addError("Minimum age cannot be greater than maximum age.");
 		if($project->min_age > $project->max_age) $form_exception->addError("Minimum age cannot be greater than maximum age.");

+ 3 - 0
controllers/project_edit.php

@@ -39,6 +39,7 @@ if($submit) {
 		$project->min_age = http::value("min_age", "int");
 		$project->min_age = http::value("min_age", "int");
 		$project->max_age = http::value("max_age", "int");
 		$project->max_age = http::value("max_age", "int");
 		$project->default_tester_fee = http::value("default_tester_fee", "float");
 		$project->default_tester_fee = http::value("default_tester_fee", "float");
+		$project->time_of_day = http::value("time_of_day", "trim");
 
 
 		$date_start = http::getDateFromFields("date_start");
 		$date_start = http::getDateFromFields("date_start");
 		$date_deadline = http::getDateFromFields("date_deadline");
 		$date_deadline = http::getDateFromFields("date_deadline");
@@ -56,6 +57,8 @@ if($submit) {
 		if(empty($project->min_age)) $form_exception->addError("Minimum age is required.");
 		if(empty($project->min_age)) $form_exception->addError("Minimum age is required.");
 		if(empty($project->max_age)) $form_exception->addError("Maximum age is required.");
 		if(empty($project->max_age)) $form_exception->addError("Maximum age is required.");
 		if(empty($project->default_tester_fee)) $form_exception->addError("Default tester fee is required.");
 		if(empty($project->default_tester_fee)) $form_exception->addError("Default tester fee is required.");
+		if(empty($project->time_of_day)) $form_exception->addError("Time of day is required.");
+		else if(!in_array($project->time_of_day, ["A", "D", "N"])) $form_exception->addError("Invalid time of day selected.");
 		if(empty($date_start)) $form_exception->addError("Start Date is required.");
 		if(empty($date_start)) $form_exception->addError("Start Date is required.");
 		if(empty($date_deadline)) $form_exception->addError("Deadline is required.");
 		if(empty($date_deadline)) $form_exception->addError("Deadline is required.");
 		if($project->min_age > $project->max_age) $form_exception->addError("Minimum age cannot be greater than maximum age.");
 		if($project->min_age > $project->max_age) $form_exception->addError("Minimum age cannot be greater than maximum age.");

+ 1 - 1
engine/project.php

@@ -4,7 +4,7 @@ class Project extends Model {
 
 
 	protected static $table = "project";
 	protected static $table = "project";
 	protected static $id_field = "id";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["customer_id", "template_id", "name", "test_count", "min_age", "max_age", "default_tester_fee", "dts_start", "dts_deadline", "dts_created", "dts_updated", "dts_report"];
+	protected static $fillable_fields = ["customer_id", "template_id", "name", "test_count", "min_age", "max_age", "default_tester_fee", "time_of_day", "dts_start", "dts_deadline", "dts_created", "dts_updated", "dts_report"];
 
 
 	protected static $field_map = [
 	protected static $field_map = [
 	];
 	];

+ 21 - 0
views/project_form.php

@@ -12,6 +12,12 @@ if($project->dts_report) {
 	$date_report_parts = explode("-", $date_report);
 	$date_report_parts = explode("-", $date_report);
 }
 }
 
 
+$time_of_day_options = [
+	"A" => "Anytime",
+	"D" => "Daytime",
+	"N" => "Nighttime",
+];
+
 ?>
 ?>
 <div class="container mt-3 py-4">
 <div class="container mt-3 py-4">
 	<h2>
 	<h2>
@@ -66,6 +72,21 @@ if($project->dts_report) {
 						</div>
 						</div>
 					</div>
 					</div>
 				</div>
 				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="time-of-day">Time of Day</label>
+					<div class="col-sm">
+						<select class="form-control" name="time_of_day" id="time-of-day" required>
+						<?php
+						foreach($time_of_day_options as $value => $display) {
+							$selected = ($value == $project->time_of_day) ? "selected" : "";
+							?>
+							<option value="<?=$value?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+							<?php
+						}
+						?>
+						</select>
+					</div>
+				</div>
 			</div>
 			</div>
 			<div class="col-lg">
 			<div class="col-lg">