From d5373b5b9d010fadf6365f9ae33ed06b03b61919 Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 12 Feb 2016 11:02:06 +0100 Subject: [PATCH] add location to seminaries --- controllers/SeminariesController.inc | 10 +++- models/SeminariesModel.inc | 12 +++-- views/html/seminaries/edit.tpl | 74 ++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 6 deletions(-) diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc index 874b2d01..05ec665d 100644 --- a/controllers/SeminariesController.inc +++ b/controllers/SeminariesController.inc @@ -298,6 +298,8 @@ $title = $seminary['title']; $course = $seminary['course']; $description = $seminary['description']; + $latitude = $seminary['latitude']; + $longitude = $seminary['longitude']; $fields = array('title', 'course'); $validation = array(); @@ -312,6 +314,8 @@ } $course = $this->request->getPostParam('course'); $description = $this->request->getPostParam('description'); + $latitude = $this->request->getPostParam('latitude'); + $longitude = $this->request->getPostParam('longitude'); // Validate moodpic $moodpic = null; @@ -348,7 +352,9 @@ $seminary['id'], $title, $course, - $description + $description, + $latitude, + $longitude ); $seminary = $this->Seminaries->getSeminaryById($seminary['id']); @@ -388,6 +394,8 @@ $this->set('title', $title); $this->set('course', $course); $this->set('description', $description); + $this->set('latitude', $latitude); + $this->set('longitude', $longitude); $this->set('mimetypes', $mimetypes); $this->set('validation', $validation); $this->set('validationSettings', $validationSettings); diff --git a/models/SeminariesModel.inc b/models/SeminariesModel.inc index ec5ee101..33fb1668 100644 --- a/models/SeminariesModel.inc +++ b/models/SeminariesModel.inc @@ -66,7 +66,7 @@ public function getSeminaryById($seminaryId) { $seminary = $this->db->query( - 'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id, map_seminarymedia_id '. + 'SELECT id, created, created_user_id, title, url, course, description, latitude, longitude, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id, map_seminarymedia_id '. 'FROM seminaries '. 'WHERE id = ?', 'i', @@ -91,7 +91,7 @@ public function getSeminaryByUrl($seminaryUrl) { $seminary = $this->db->query( - 'SELECT id, created, created_user_id, title, url, course, description, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id, map_seminarymedia_id '. + 'SELECT id, created, created_user_id, title, url, course, description, latitude, longitude, seminarymedia_id, charactergroups_seminarymedia_id, achievements_seminarymedia_id, library_seminarymedia_id, map_seminarymedia_id '. 'FROM seminaries '. 'WHERE url = ?', 's', @@ -309,17 +309,19 @@ * @param string $course New course of Seminary * @param string $description New description of Seminary */ - public function editSeminary($seminaryId, $title, $course, $description) + public function editSeminary($seminaryId, $title, $course, $description, $latitude, $longitude) { $this->db->query( 'UPDATE seminaries '. - 'SET title = ?, url = ?, course = ?, description = ? '. + 'SET title = ?, url = ?, course = ?, description = ?, latitude = ?, longitude = ? '. 'WHERE id = ?', - 'ssssi', + 'ssssddi', $title, \nre\core\Linker::createLinkParam($title), $course, $description, + $latitude, + $longitude, $seminaryId ); } diff --git a/views/html/seminaries/edit.tpl b/views/html/seminaries/edit.tpl index f6dc5053..47529ec2 100644 --- a/views/html/seminaries/edit.tpl +++ b/views/html/seminaries/edit.tpl @@ -70,5 +70,79 @@