From d76e7e74d5748ac7030284a4a9b2fabf215b0859 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 2 Aug 2023 10:34:19 +0200
Subject: [PATCH] [Labels] Added custom papertypes to create label

---
 application/controllers/Labels.php  | 3 +++
 application/views/labels/create.php | 8 ++++++++
 application/views/labels/edit.php   | 4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Labels.php b/application/controllers/Labels.php
index cc7dd50f..e3bb0cbe 100644
--- a/application/controllers/Labels.php
+++ b/application/controllers/Labels.php
@@ -71,6 +71,9 @@ class Labels extends CI_Controller {
 		$data['page_title'] = "Create Label Type";
 
 		$this->load->library('form_validation');
+		$this->load->model('labels_model');
+
+		$data['papertypes'] = $this->labels_model->fetchPapertypes($this->session->userdata('user_id'));
 
 		$this->form_validation->set_rules('label_name', 'Label Name', 'required');
 
diff --git a/application/views/labels/create.php b/application/views/labels/create.php
index daf88f55..39b3c3b7 100644
--- a/application/views/labels/create.php
+++ b/application/views/labels/create.php
@@ -28,8 +28,16 @@
     			<label class="col-sm-2 col-form-label" for="paperType">Paper Type</label>
 			    <div class="col-sm-4">
 				    <select name="paper_type" class="form-control" id="paperType">
+						<option value="a3">A3</option>
+						<option value="a5">A5</option>
 						<option value="a4">A4</option>
 						<option value="letter">Letter</option>
+						<option value="legal">Legal</option>
+						<?php
+							foreach($papertypes as $paper){
+								echo '<option value=' . $paper->paper_name . '>' . ucwords(strtolower(($paper->paper_name))) . '</option>';
+							}
+						?>
 					</select>
 			    </div>
 
diff --git a/application/views/labels/edit.php b/application/views/labels/edit.php
index f9352562..ff2d1b84 100644
--- a/application/views/labels/edit.php
+++ b/application/views/labels/edit.php
@@ -35,7 +35,9 @@
 						<option value="legal" <?php if($label->paper_type == "legal") { echo "selected=\"selected\""; } ?>>Legal</option>
 						<?php
 							foreach($papertypes as $paper){
-								echo '<option value=' . $paper->paper_name . '>' . ucwords(strtolower(($paper->paper_name))) . '</option>';
+								echo '<option value="' . $paper->paper_name . '"';
+								if ($label->paper_type == $paper->paper_name) echo ' selected';
+								echo '>' . ucwords(strtolower(($paper->paper_name))) . '</option>';
 							}
 						?>
 					</select>