Переглянути джерело

Converted date fields to dropdowns.

Alan Lam 8 роки тому
батько
коміт
55586bfd4d
4 змінених файлів з 75 додано та 7 видалено
  1. 5 2
      controllers/project_add.php
  2. 2 2
      controllers/project_edit.php
  3. 28 0
      engine/http.php
  4. 40 3
      views/project_form.php

+ 5 - 2
controllers/project_add.php

@@ -18,6 +18,8 @@ $templates = $customer->getTemplates();
 if(empty($templates)) throw new Exception("A template must exist for $customer->name before a project can be created.");
 if(empty($templates)) throw new Exception("A template must exist for $customer->name before a project can be created.");
 
 
 $project = new Project;
 $project = new Project;
+$project->dts_start = date("Y-m-d H:i:s", mktime(0, 0, 0, date("m"), 1));
+$project->dts_deadline = date("Y-m-d H:i:s", strtotime("last day of " . date("M")));
 $project->customer_id = $customer->id;
 $project->customer_id = $customer->id;
 $project->default_tester_fee = 10;
 $project->default_tester_fee = 10;
 
 
@@ -36,8 +38,9 @@ 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", "int");
 		$project->default_tester_fee = http::value("default_tester_fee", "int");
-		$project->dts_start = http::value("date_start");
-		$project->dts_deadline = http::value("date_deadline");
+
+		$project->dts_start = http::getDateFromFields("date_start");
+		$project->dts_deadline = http::getDateFromFields("date_deadline");
 
 
 		$form_exception = new FormException;
 		$form_exception = new FormException;
 
 

+ 2 - 2
controllers/project_edit.php

@@ -39,8 +39,8 @@ 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", "int");
 		$project->default_tester_fee = http::value("default_tester_fee", "int");
-		$project->dts_start = http::value("date_start");
-		$project->dts_deadline = http::value("date_deadline");
+		$project->dts_start = http::getDateFromFields("date_start");
+		$project->dts_deadline = http::getDateFromFields("date_deadline");
 
 
 		$form_exception = new FormException;
 		$form_exception = new FormException;
 
 

+ 28 - 0
engine/http.php

@@ -32,6 +32,34 @@ class HTTP {
 		return $result;
 		return $result;
 	}
 	}
 
 
+	public static function getDateFromFields($prefix = "") {
+		$date = false;
+
+		if(empty($prefix)) {
+			$year_field = "year";
+			$month_field = "month";
+			$day_field = "day";
+		}
+		else {
+			$year_field = $prefix . "_year";
+			$month_field = $prefix . "_month";
+			$day_field = $prefix . "_day";
+		}
+
+		$year = http::value($year_field, "int");
+		$month = http::value($month_field, "int");
+		$day = http::value($day_field, "int");
+
+		if($year && $month && $day) {
+			$month = str_pad($month, 2, "0", STR_PAD_LEFT);
+			$day = str_pad($day, 2, "0", STR_PAD_LEFT);
+			$unix = strtotime("$year-$month-$day");
+			$date = date("Y-m-d", $unix);
+		}
+
+		return $date;
+	}
+
 	public static function value($key, $validation = "none", $request_type = "request") {
 	public static function value($key, $validation = "none", $request_type = "request") {
 
 
 		$request_type = strtolower($request_type);
 		$request_type = strtolower($request_type);

+ 40 - 3
views/project_form.php

@@ -1,7 +1,10 @@
 <?php
 <?php
 
 
 $date_start = explode(" ", $project->dts_start)[0];
 $date_start = explode(" ", $project->dts_start)[0];
+$date_start_parts = explode("-", $date_start);
+
 $date_deadline = explode(" ", $project->dts_deadline)[0];
 $date_deadline = explode(" ", $project->dts_deadline)[0];
+$date_deadline_parts = explode("-", $date_deadline);
 
 
 ?>
 ?>
 <div class="container mt-3 py-4">
 <div class="container mt-3 py-4">
@@ -68,15 +71,49 @@ $date_deadline = explode(" ", $project->dts_deadline)[0];
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="row mb-1">
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label" for="date-start">Start Date</label>
+					<label class="col-sm-4 col-form-label" for="date-start-day">Start Date</label>
 					<div class="col-sm">
 					<div class="col-sm">
-						<input class="form-control" type="date" name="date_start" id="date-start" placeholder="Enter start date" value="<?=htmlspecialchars($date_start)?>" required />
+						<select class="form-control w-auto d-inline-block" name="date_start_day" id="date-start-day">
+							<option value="">Day</option>
+							<?php
+							Form::renderDayOptions($date_start_parts[2]);
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="date_start_month" id="date-start-month">
+							<option value="">Month</option>
+							<?php
+							Form::renderMonthOptions($date_start_parts[1]);
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="date_start_year" id="date-start-year">
+							<option value="">Year</option>
+							<?php
+							Form::renderYearOptions(2017, date("Y") + 1, $date_start_parts[0]);
+							?>
+						</select>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="row mb-1">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label" for="date-deadline">Deadline</label>
 					<label class="col-sm-4 col-form-label" for="date-deadline">Deadline</label>
 					<div class="col-sm">
 					<div class="col-sm">
-						<input class="form-control" type="date" name="date_deadline" id="date-deadline" placeholder="Enter deadline" value="<?=htmlspecialchars($date_deadline)?>" required />
+						<select class="form-control w-auto d-inline-block" name="date_deadline_day" id="date-deadline-day">
+							<option value="">Day</option>
+							<?php
+							Form::renderDayOptions($date_deadline_parts[2]);
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="date_deadline_month" id="date-deadline-month">
+							<option value="">Month</option>
+							<?php
+							Form::renderMonthOptions($date_deadline_parts[1]);
+							?>
+						</select>
+						<select class="form-control w-auto d-inline-block" name="date_deadline_year" id="date-deadline-year">
+							<option value="">Year</option>
+							<?php
+							Form::renderYearOptions(2017, date("Y") + 1, $date_deadline_parts[0]);
+							?>
+						</select>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>