Просмотр исходного кода

Add ability to define browse time, play money and play time for a project

Alan Lam 3 лет назад
Родитель
Сommit
69fc008742

+ 3 - 0
controllers/project_add.php

@@ -43,6 +43,9 @@ if($submit) {
 		$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");
 		$project->time_of_day = HTTP::value("time_of_day", "trim");
 		$project->tester_can_claim = HTTP::value("tester_can_claim", "trim");
 		$project->tester_can_claim = HTTP::value("tester_can_claim", "trim");
+		$project->browse_time = HTTP::value("browse_time", "int");
+		$project->play_money = HTTP::value("play_money", "int");
+		$project->play_time = HTTP::value("play_time", "int");
 
 
 		$date_start = HTTP::value("date_start");
 		$date_start = HTTP::value("date_start");
 		$date_deadline = HTTP::value("date_deadline");
 		$date_deadline = HTTP::value("date_deadline");

+ 3 - 0
controllers/project_edit.php

@@ -49,6 +49,9 @@ if($submit) {
 		$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");
 		$project->time_of_day = HTTP::value("time_of_day", "trim");
 		$project->tester_can_claim = HTTP::value("tester_can_claim", "trim");
 		$project->tester_can_claim = HTTP::value("tester_can_claim", "trim");
+		$project->browse_time = HTTP::value("browse_time", "int");
+		$project->play_money = HTTP::value("play_money", "int");
+		$project->play_time = HTTP::value("play_time", "int");
 
 
 		$date_start = HTTP::value("date_start");
 		$date_start = HTTP::value("date_start");
 		$date_deadline = HTTP::value("date_deadline");
 		$date_deadline = HTTP::value("date_deadline");

+ 14 - 0
db/migrations/20230125213600_add_pre_test_fields_to_project_table.php

@@ -0,0 +1,14 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+class AddPreTestFieldsToProjectTable extends AbstractMigration {
+	public function change() {
+		$this->table("project")
+			->addColumn("browse_time", "integer", ["signed" => false, "null" => true, "limit" => MysqlAdapter::INT_TINY, "after" => "tester_can_claim"])
+			->addColumn("play_money", "decimal", ["signed" => false, "null" => true, "precision" => 5, "scale" => 2, "after" => "browse_time"])
+			->addColumn("play_time", "integer", ["signed" => false, "null" => true, "limit" => MysqlAdapter::INT_TINY, "after" => "play_money"])
+			->update();
+	}
+}

+ 66 - 1
engine/project.php

@@ -15,6 +15,9 @@ use Carbon\CarbonImmutable;
  * @property float $default_tester_fee
  * @property float $default_tester_fee
  * @property string $time_of_day
  * @property string $time_of_day
  * @property bool $tester_can_claim
  * @property bool $tester_can_claim
+ * @property int $browse_time
+ * @property int $play_money
+ * @property int $play_time
  * @property string $template_overrides_json
  * @property string $template_overrides_json
  * @property string $dts_start
  * @property string $dts_start
  * @property string $dts_deadline
  * @property string $dts_deadline
@@ -33,7 +36,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", "template_keys", "name", "test_count", "min_age", "max_age", "default_customer_fee", "default_tester_fee", "time_of_day", "tester_can_claim", "template_overrides_json", "dts_start", "dts_deadline", "dts_created", "dts_updated", "dts_report", "dts_finished", "user_id_finished"];
+	protected static $fillable_fields = ["customer_id", "template_id", "template_keys", "name", "test_count", "min_age", "max_age", "default_customer_fee", "default_tester_fee", "time_of_day", "tester_can_claim", "browse_time", "play_money", "play_time", "template_overrides_json", "dts_start", "dts_deadline", "dts_created", "dts_updated", "dts_report", "dts_finished", "user_id_finished"];
 
 
 	/**
 	/**
 	 * @var Test[] $tests
 	 * @var Test[] $tests
@@ -607,5 +610,67 @@ class Project extends Model {
 		return true;
 		return true;
 	}
 	}
 
 
+	public function renderBeforeTestSection(): void {
+
+		if(!$this->browse_time && !$this->play_money && !$this->play_time) {
+			return;
+		}
+
+		?>
+		<section class="mb-4">
+			<div class="card">
+				<div class="card-header">
+					<?=htmlspecialchars(__("Important"))?>
+				</div>
+				<div class="card-body">
+					<ol>
+						<?php
+						if($this->browse_time) {
+							?>
+							<li>
+								<?=htmlspecialchars(n__(
+									"This test requires %d minute of browsing time.",
+									"This test requires %d minutes of browsing time.",
+									$this->browse_time,
+									$this->browse_time
+								))?>
+							</li>
+							<?php
+						}
+						if($this->play_money > 0) {
+							?>
+							<li>
+								<?=htmlspecialchars(__("This test has a total of £%.02f reimbursible play money.", $this->play_money))?>
+								<?=htmlspecialchars(__("Do not spend more than this."))?>
+							</li>
+							<?php
+						}
+						if($this->play_time) {
+							?>
+							<li>
+								<?=htmlspecialchars(n__(
+									"You must play the machine for %d minute.",
+									"You must play the machine for %d minutes.",
+									$this->play_time,
+									$this->play_time
+								))?>
+							</li>
+							<?php
+						}
+						?>
+					</ol>
+
+					<div class="custom-control custom-switch">
+						<input class="custom-control-input" id="accept-important-instructions" type="checkbox" value="1" required />
+						<label class="custom-control-label" for="accept-important-instructions"><?=htmlspecialchars(__("I have read and agree to the above."))?></label>
+					</div>
+
+				</div>
+			</div>
+		</section>
+		<?php
+
+	}
+
 
 
 }
 }

+ 8 - 1
engine/template.php

@@ -206,9 +206,10 @@ class Template extends Model {
 	}
 	}
 
 
 	/**
 	/**
+	 * @param Project|null $project
 	 * @throws Exception
 	 * @throws Exception
 	 */
 	 */
-	public function renderBeforeTestForm(): void {
+	public function renderBeforeTestForm(?Project $project = null): void {
 
 
 		$json = json_decode($this->getJSON());
 		$json = json_decode($this->getJSON());
 		$fields = $json->beforeTest;
 		$fields = $json->beforeTest;
@@ -216,6 +217,12 @@ class Template extends Model {
 		?>
 		?>
 		<form method="post" enctype="multipart/form-data" id="before-test-form">
 		<form method="post" enctype="multipart/form-data" id="before-test-form">
 
 
+			<?php
+			if($project) {
+				$project->renderBeforeTestSection();
+			}
+			?>
+
 			<div class="alert alert-info">
 			<div class="alert alert-info">
 				<i class="fal fa-fw fa-info-circle"></i>
 				<i class="fal fa-fw fa-info-circle"></i>
 				Answer as clearly and accurately as you can otherwise you may be contacted after the test for clarification and/or verification purposes.
 				Answer as clearly and accurately as you can otherwise you may be contacted after the test for clarification and/or verification purposes.

+ 6 - 5
views/practice_form.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
 /**
 /**
  * @controller practice.php
  * @controller practice.php
  *
  *
@@ -9,10 +9,11 @@
 ?>
 ?>
 <div class="container mt-3 py-4">
 <div class="container mt-3 py-4">
 <?php
 <?php
-if($test->status == Test::STATUS_CONFIRMED) {
+
+if($test->isConfirmed()) {
 	$template->renderBeforeTestForm();
 	$template->renderBeforeTestForm();
 }
 }
-else if($test->status == Test::STATUS_STARTED) {
+else if($test->hasStarted()) {
 	$template->renderDuringTestForm();
 	$template->renderDuringTestForm();
 }
 }
 else {
 else {
@@ -34,13 +35,13 @@ else {
 			$field->value = in_array($name, Test::TEST_FIELDS) ? $test->$name : ($values[$name] ?? null);
 			$field->value = in_array($name, Test::TEST_FIELDS) ? $test->$name : ($values[$name] ?? null);
 		}
 		}
 
 
-		if($field->type == "header") {
+		if($field->type === "header") {
 			?>
 			?>
 			<hr />
 			<hr />
 			<?php
 			<?php
 		}
 		}
 
 
-		if($field->type == "file") {
+		if($field->type === "file") {
 			?>
 			?>
 			<div class="row mb-1">
 			<div class="row mb-1">
 				<div class="col-sm-4 col-form-label">
 				<div class="col-sm-4 col-form-label">

+ 19 - 2
views/project_form.php

@@ -9,8 +9,6 @@
  * @var Template $template
  * @var Template $template
  */
  */
 
 
-use Carbon\CarbonImmutable;
-
 $dt_start = $project->getDateTimeStart();
 $dt_start = $project->getDateTimeStart();
 $dt_deadline = $project->getDateTimeDeadline();
 $dt_deadline = $project->getDateTimeDeadline();
 
 
@@ -239,6 +237,25 @@ $output_locations = static function(array $locations, bool $selected) use ($loca
 						<input class="form-control" type="date" name="date_report" id="date-report" value="<?=$date_report?>" />
 						<input class="form-control" type="date" name="date_report" id="date-report" value="<?=$date_report?>" />
 					</div>
 					</div>
 				</div>
 				</div>
+
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="browse-time">Browse Time (Mins)</label>
+					<div class="col-sm">
+						<input class="form-control" type="number" name="browse_time" id="browse-time" value="<?=$project->browse_time?>" min="0" placeholder="Enter browse time" />
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="play-money">Play Money</label>
+					<div class="col-sm">
+						<input class="form-control" type="number" name="play_money" id="play-money" value="<?=$project->play_money?>" min="0" step="any" placeholder="Enter play money" />
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="play-time">Play Time (Mins)</label>
+					<div class="col-sm">
+						<input class="form-control" type="number" name="play_time" id="play-time" value="<?=$project->play_time?>" min="0" placeholder="Enter play time" />
+					</div>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 
 

+ 1 - 1
views/test_form.php

@@ -11,7 +11,7 @@
 <div class="container mt-3 py-4">
 <div class="container mt-3 py-4">
 <?php
 <?php
 if($test->isConfirmed()) {
 if($test->isConfirmed()) {
-	$template->renderBeforeTestForm();
+	$template->renderBeforeTestForm($project);
 }
 }
 else if($test->hasStarted()) {
 else if($test->hasStarted()) {
 	$template->renderDuringTestForm();
 	$template->renderDuringTestForm();