Ver Fonte

Add support for decimals for tester fees.

Alan Lam há 8 anos atrás
pai
commit
4c750eb18b

+ 1 - 1
controllers/project_add.php

@@ -37,7 +37,7 @@ if($submit) {
 		$project->test_count = http::value("test_count", "int");
 		$project->test_count = http::value("test_count", "int");
 		$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", "int");
+		$project->default_tester_fee = http::value("default_tester_fee", "float");
 
 
 		$project->dts_start = http::getDateFromFields("date_start");
 		$project->dts_start = http::getDateFromFields("date_start");
 		$project->dts_deadline = http::getDateFromFields("date_deadline");
 		$project->dts_deadline = http::getDateFromFields("date_deadline");

+ 1 - 1
controllers/project_edit.php

@@ -38,7 +38,7 @@ if($submit) {
 		$project->test_count = http::value("test_count", "int");
 		$project->test_count = http::value("test_count", "int");
 		$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", "int");
+		$project->default_tester_fee = http::value("default_tester_fee", "float");
 		$project->dts_start = http::getDateFromFields("date_start");
 		$project->dts_start = http::getDateFromFields("date_start");
 		$project->dts_deadline = http::getDateFromFields("date_deadline");
 		$project->dts_deadline = http::getDateFromFields("date_deadline");
 
 

+ 1 - 1
controllers/test.php

@@ -249,7 +249,7 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 			}
 			}
 
 
 			$test->test_fee = null;
 			$test->test_fee = null;
-			$tester_fee = http::value("tester_fee", "int");
+			$tester_fee = http::value("tester_fee", "float");
 			if($tester_fee != $project->default_tester_fee) {
 			if($tester_fee != $project->default_tester_fee) {
 				$test->test_fee = $tester_fee;
 				$test->test_fee = $tester_fee;
 			}
 			}

+ 6 - 1
views/project_form.php

@@ -52,7 +52,12 @@ $date_deadline_parts = explode("-", $date_deadline);
 				<div class="row mb-1">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label" for="default-tester-fee">Default Tester Fee</label>
 					<label class="col-sm-4 col-form-label" for="default-tester-fee">Default Tester Fee</label>
 					<div class="col-sm">
 					<div class="col-sm">
-						<input class="form-control" type="number" name="default_tester_fee" id="default-tester-fee" placeholder="Enter default tester fee" value="<?=htmlspecialchars($project->default_tester_fee)?>" required />
+						<div class="input-group">
+							<div class="input-group-prepend">
+								<span class="input-group-text">£</span>
+							</div>
+							<input class="form-control" type="number" name="default_tester_fee" min=0" step="0.01" id="default-tester-fee" placeholder="Enter default tester fee" value="<?=htmlspecialchars($project->default_tester_fee)?>" required />
+						</div>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>

+ 6 - 1
views/test_verify_form.php

@@ -253,7 +253,12 @@ function render_card_list_group($details) {
 						<div class="row mb-1">
 						<div class="row mb-1">
 							<label class="col-sm-4 col-form-label" for="tester-fee">Tester Fee Override</label>
 							<label class="col-sm-4 col-form-label" for="tester-fee">Tester Fee Override</label>
 							<div class="col-sm">
 							<div class="col-sm">
-								<input class="form-control" type="number" name="tester_fee" id="tester-fee" placeholder="Enter tester fee override" />
+								<div class="input-group">
+									<div class="input-group-prepend">
+										<span class="input-group-text">£</span>
+									</div>
+									<input class="form-control" type="number" step="0.01" min="0" name="tester_fee" id="tester-fee" placeholder="Enter tester fee override" value="<?=htmlspecialchars($test->test_fee)?>" />
+								</div>
 							</div>
 							</div>
 						</div>
 						</div>
 						<div class="row mb-1">
 						<div class="row mb-1">