Skip to content

T
TimeOutAdmin
Commit 0b4143b2 by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request tobin/timeOut!5
parents 07384d4d e787b611
Showing with 53 additions and 21 deletions
application/controllers/Event.php
...@@ -150,21 +150,28 @@ class Event extends CI_Controller { ...@@ -150,21 +150,28 @@ class Event extends CI_Controller {
$evtMediaData = array(); $evtMediaData = array();
if(!empty($files = $_FILES)){ if(!empty($files = $_FILES)){
$media_type = 0;
$images = array(); $images = array();
$this->load->library('upload',set_upload_service("assets/uploads/services")); $this->load->library('upload');
for ($typ = 0; $typ < count($files); $typ++) { $config = set_upload_service("assets/uploads/services");
for ($typ = 0; $typ < count($files['event_image']['name']); $typ++) {
$_FILES['file']['name'] = $files['event_image']['name'][$typ]; $_FILES['file']['name'] = $files['event_image']['name'][$typ];
$_FILES['file']['type'] = $files['event_image']['type'][$typ]; $_FILES['file']['type'] = $files['event_image']['type'][$typ];
$_FILES['file']['size'] = $files['event_image']['size'][$typ]; $_FILES['file']['size'] = $files['event_image']['size'][$typ];
$_FILES['file']['error'] = $files['event_image']['error'][$typ]; $_FILES['file']['error'] = $files['event_image']['error'][$typ];
$_FILES['file']['tmp_name'] = $files['event_image']['tmp_name'][$typ]; $_FILES['file']['tmp_name'] = $files['event_image']['tmp_name'][$typ];
$config['file_name'] = time()."_".$_FILES['file']['name'];
$this->upload->initialize($config);
if($this->upload->do_upload('file')){ if($this->upload->do_upload('file')){
$imgData = $this->upload->data(); $imgData = $this->upload->data();
$evtMediaData[] = array( $evtMediaData[] = array(
'event_id'=>$event_id, 'event_id'=>$event_id,
'media_type'=>'1', 'media_type'=>$media_type,
'media_url'=>"assets/uploads/services/".$imgData['file_name']); 'media_url'=>"assets/uploads/services/".$imgData['file_name']);
$media_type = '1';
} }
} }
$status = $this->Event_model->createEventMedia($evtMediaData); $status = $this->Event_model->createEventMedia($evtMediaData);
...@@ -302,13 +309,19 @@ class Event extends CI_Controller { ...@@ -302,13 +309,19 @@ class Event extends CI_Controller {
} }
$status = $this->Event_model->updateTags($event_id,$insertTag); $status = $this->Event_model->updateTags($event_id,$insertTag);
$existingImages = (isset($_POST['existingImages']) && !empty($_POST['existingImages']))?
$_POST['existingImages']:'';
$evtMediaData = array(); $evtMediaData = array();
if(isset($_FILES) && isset($_FILES['event_image']) && isset($_FILES['event_image']['name']) && if(isset($_FILES) && isset($_FILES['event_image']) && isset($_FILES['event_image']['name']) &&
count($_FILES['event_image']['name']) > 1){ count($_FILES['event_image']['name']) > 1){
$files = $_FILES; $files = $_FILES;
$media_type = (!empty($existingImages))?1:0;
$images = array(); $images = array();
$this->load->library('upload',set_upload_service("assets/uploads/services")); $this->load->library('upload');
$config = set_upload_service("assets/uploads/services");
for ($typ = 0; $typ < count($files['event_image']['name']); $typ++) { for ($typ = 0; $typ < count($files['event_image']['name']); $typ++) {
$_FILES['file']['name'] = $files['event_image']['name'][$typ]; $_FILES['file']['name'] = $files['event_image']['name'][$typ];
$_FILES['file']['type'] = $files['event_image']['type'][$typ]; $_FILES['file']['type'] = $files['event_image']['type'][$typ];
...@@ -316,18 +329,20 @@ class Event extends CI_Controller { ...@@ -316,18 +329,20 @@ class Event extends CI_Controller {
$_FILES['file']['error'] = $files['event_image']['error'][$typ]; $_FILES['file']['error'] = $files['event_image']['error'][$typ];
$_FILES['file']['tmp_name'] = $files['event_image']['tmp_name'][$typ]; $_FILES['file']['tmp_name'] = $files['event_image']['tmp_name'][$typ];
$config['file_name'] = time()."_".$_FILES['file']['name'];
$this->upload->initialize($config);
if($this->upload->do_upload('file')){ if($this->upload->do_upload('file')){
$imgData = $this->upload->data(); $imgData = $this->upload->data();
$evtMediaData[] = array( $evtMediaData[] = array(
'event_id'=>$event_id, 'event_id'=>$event_id,
'media_type'=>'1', 'media_type'=>$media_type,
'media_url'=>"assets/uploads/services/".$imgData['file_name']); 'media_url'=>"assets/uploads/services/".$imgData['file_name']);
$media_type = '1';
} }
} }
} }
$existingImages = (isset($_POST['existingImages']) && !empty($_POST['existingImages']))?
$_POST['existingImages']:'';
$status = $this->Event_model->updateEventMedia($event_id,$evtMediaData,$existingImages); $status = $this->Event_model->updateEventMedia($event_id,$evtMediaData,$existingImages);
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
......
application/models/Event_model.php
...@@ -175,7 +175,6 @@ class Event_model extends CI_Model { ...@@ -175,7 +175,6 @@ class Event_model extends CI_Model {
if(empty($event_id)){ if(empty($event_id)){
return 0; return 0;
} }
if(!empty($existingImages)){ if(!empty($existingImages)){
$this->db->query("DELETE FROM event_gallery $this->db->query("DELETE FROM event_gallery
WHERE id NOT IN (".implode(",",$existingImages).") AND event_id=$event_id"); WHERE id NOT IN (".implode(",",$existingImages).") AND event_id=$event_id");
......
application/views/Event/eventAddForm.php
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label>Event Description</label> <label>Event Description</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Venue Description" name="event_discription" required <textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Venue Description" name="event_discription"
style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea> style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea>
</div> </div>
</div> </div>
......
application/views/Event/eventEditForm.php
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label>Event Description</label> <label>Event Description</label>
<textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Venue Description" name="event_discription" required <textarea id="rich_editor" type="text" class="ip_reg_form_input form-control reset-form-custom" placeholder="Venue Description" name="event_discription"
style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $event_data->event_discription ?></textarea> style="height:108px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $event_data->event_discription ?></textarea>
</div> </div>
</div> </div>
...@@ -227,6 +227,22 @@ ...@@ -227,6 +227,22 @@
<div id="multipleImageInputCntr"> <div id="multipleImageInputCntr">
<?php <?php
$count = 1; $count = 1;
if(isset($event_data->eventMedia[0]) && !empty($event_data->eventMedia[0])){
foreach($event_data->eventMedia[0] AS $photos){ ?>
<div class="dropZoneContainer" id="multiImageCntr_<?= $count ?>">
<input type="hidden" name="existingImages[]" value="<?= $photos['id'] ?>">
<div id="multiImageClose_<?= $count ?>" class="close_custom cpoint"
onclick="removeImage('<?= $count ?>');">&times;</div>
<input disabled type="file" name="event_image[]" class="multiFileUpload"
accept="image/*" onchange="setMultiImg(this,jQuery(this));"
count="<?= $count ?>" />
<img class="multiDropZoneOverlay" id="multiImageImg_<?= $count ?>"
src="<?= base_url($photos['media_url']) ?>" onerror="this.src='<?=base_url("assets/images/add-image.png")?>';" />
</div>
<?php
$count += 1;
}
}
if(isset($event_data->eventMedia[1]) && !empty($event_data->eventMedia[1])){ if(isset($event_data->eventMedia[1]) && !empty($event_data->eventMedia[1])){
foreach($event_data->eventMedia[1] AS $photos){ ?> foreach($event_data->eventMedia[1] AS $photos){ ?>
<div class="dropZoneContainer" id="multiImageCntr_<?= $count ?>"> <div class="dropZoneContainer" id="multiImageCntr_<?= $count ?>">
...@@ -242,7 +258,7 @@ ...@@ -242,7 +258,7 @@
<?php <?php
$count += 1; $count += 1;
} }
} }
?> ?>
<div class="dropZoneContainer" id="multiImageCntr_<?= $count ?>"> <div class="dropZoneContainer" id="multiImageCntr_<?= $count ?>">
<div id="multiImageClose_<?= $count ?>" class="close_custom cpoint hide" <div id="multiImageClose_<?= $count ?>" class="close_custom cpoint hide"
......
application/views/Event/viewEventDetails.php
...@@ -182,4 +182,4 @@ ...@@ -182,4 +182,4 @@
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
\ No newline at end of file
application/views/Event/viewEventList.php
...@@ -40,9 +40,10 @@ ...@@ -40,9 +40,10 @@
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th>Event Name</th> <th>Event Name</th>
<th>Venue</th> <th>Category</th>
<th>Region</th> <th>Region</th>
<th>Location</th> <th>Venue</th>
<!-- <th>Location</th> -->
<th>Status</th> <th>Status</th>
<th width="300px">Action</th> <th width="300px">Action</th>
</tr> </tr>
...@@ -54,9 +55,9 @@ ...@@ -54,9 +55,9 @@
<tr> <tr>
<td class="hidden"><?= $event->event_id ?></td> <td class="hidden"><?= $event->event_id ?></td>
<td><?= $event->event_name ?></td> <td><?= $event->event_name ?></td>
<td><?= $event->venue_name ?></td> <td><?= $event->category ?></td>
<td><?= $event->region_name ?></td> <td><?= $event->region_name ?></td>
<td><?= $event->location ?></td> <td><?= $event->venue_name ?></td>
<td> <td>
<?php <?php
switch($event->event_status){ switch($event->event_status){
......
application/views/Login/login-form.php
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<li> <li>
<p> <p>
<strong>"</strong> <strong>"</strong>
Banking is a very treacherous business because<br> you don't realize it is risky until it is too late. To achieve great things, two things are needed: a plan and not quite enough time.
<strong>"</strong> <strong>"</strong>
</p> </p>
<h6>Margrim Nicholas</h6> <h6>Margrim Nicholas</h6>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<li> <li>
<p> <p>
<strong>"</strong> <strong>"</strong>
Banking is a very treacherous business because <br>you don't realize it is risky until it is too late. Productivity is never an accident. It is always the result of a commitment to excellence, intelligent planning, and focused effort.
<strong>"</strong> <strong>"</strong>
</p> </p>
<h6>Marie Lorem</h6> <h6>Marie Lorem</h6>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<li> <li>
<p> <p>
<strong>"</strong> <strong>"</strong>
Banking is a very treacherous business because <br>you don't realize it is risky until it is too late. There are some people who live in a dream world, and there are some who face reality; and then there are those who turn one into the other.
<strong>"</strong> <strong>"</strong>
</p> </p>
<h6>Lewis Adam</h6> <h6>Lewis Adam</h6>
......
application/views/Venue/venueAddForm.php
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<input type="text" class="form-control required" data-parsley-trigger="change" name="locality" placeholder="Locality"> <input type="text" class="form-control required" data-parsley-trigger="change" name="locality" placeholder="Locality">
</div> </div>
<div id="useExist" class="form-group hide"> <div id="useExist" class="form-group hide">
<select name="locality_id" class="form-control required" placeholder="Select Locality"></select> <select name="locality_id" class="form-control" placeholder="Select Locality"></select>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
!empty($venue_data) && !empty($venue_data->layout) && !empty($venue_data) && !empty($venue_data->layout) &&
!empty($venue_data->layout_details) && !empty($venue_data->layout_details) &&
!empty($layoutDetails = json_decode($venue_data->layout_details))){ ?> !empty($layoutDetails = json_decode($venue_data->layout_details))){ ?>
<input type="hidden" name="has_layout" value='1'>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label>Layout</label> <label>Layout</label>
...@@ -215,6 +216,7 @@ ...@@ -215,6 +216,7 @@
<!-- Layout Container --> <!-- Layout Container -->
<div id="layoutCntrHtml" class="hide"> <div id="layoutCntrHtml" class="hide">
<input type="hidden" name="has_layout" value='1'>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label>Layout</label> <label>Layout</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment