From c042097dd11593cce1aabf23fda882a2db30a406 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sun, 24 Jul 2022 21:16:37 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Jobs.php          |   7 +-
 www/application/models/Job_model.php          |   2 +-
 .../views/jobs/uploads/upload_files.php       | 120 ++++++++++++++++++
 www/application/views/jobs/view_jobgroup.php  |  81 ++++++++----
 .../views/jobs/view_startcreate.php           |   2 +-
 www/application/views/jobs/view_thisjob.php   |  11 +-
 .../internal/template/view_securefooter.php   |   2 +-
 7 files changed, 189 insertions(+), 36 deletions(-)
 create mode 100644 www/application/views/jobs/uploads/upload_files.php

diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php
index 13ee6f3f..fc9481e1 100644
--- a/www/application/controllers/Jobs.php
+++ b/www/application/controllers/Jobs.php
@@ -876,9 +876,10 @@ echo   $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
             $data["group_name"] = "";
             $data["group_member_table"] = "Please add a group";
         }
-        $this->load->view('users/view_header_user', $data);
-        $this->load->view('jobs/view_jobgroup', $data);
-        $this->load->view('users/view_footer_user', $data);
+       // $this->load->view('users/view_header_user', $data);
+      //  $this->load->view('jobs/view_jobgroup', $data);
+      //  $this->load->view('users/view_footer_user', $data);
+        $this->renderSecurePage('jobs/view_jobgroup', $data);
     }
 
     public function jobgrp_members() {
diff --git a/www/application/models/Job_model.php b/www/application/models/Job_model.php
index 1e05a30b..02742f11 100644
--- a/www/application/models/Job_model.php
+++ b/www/application/models/Job_model.php
@@ -101,7 +101,7 @@ class Job_model extends CI_Model {
         $this->tableStr = '<table class=\'table table-striped table-hover table-bordered table-condensed\' style=\'border-spacing: 1px;  padding: 0px;   border-collapse: separate;\' >';
         $i = 0;
         foreach ($query->result() as $row) {
-            $this->tableStr .="<tr><td style='width:10px;'><input type=\"radio\" name=\"unstyled-radio-left\" value=\"" . $row->id . "\" onchange=\"jobGroupChanged(this,'".str_replace("'","\\'",stripslashes($row->group_name))."')\"".(($sel==$row->id || ($sel<1 && $i==0))?"checked":"")."></td><td>" . $row->group_name . "</td><td><button class=\"btn btn-danger btn-sm btn-xs\" type=\"button\" onclick=\"deleteJobGroup(".$row->id.",'".str_replace("'","\\'",stripslashes($row->group_name))."')\">X</button></td></tr>";
+            $this->tableStr .="<tr><td style='width:10px;'><input type=\"radio\" name=\"unstyled-radio-left\" value=\"" . $row->id . "\" onchange=\"jobGroupChanged(this,'".str_replace("'","\\'",stripslashes($row->group_name))."')\"".(($sel==$row->id || ($sel<1 && $i==0))?"checked":"")."></td><td>" . $row->group_name . "</td><td><button class=\"btn btn-danger btn-sm\" type=\"button\" onclick=\"deleteJobGroup(".$row->id.",'".str_replace("'","\\'",stripslashes($row->group_name))."')\">X</button></td></tr>";
             $groups[$row->id] = $row->group_name;
             $i++;
         }
diff --git a/www/application/views/jobs/uploads/upload_files.php b/www/application/views/jobs/uploads/upload_files.php
new file mode 100644
index 00000000..a190e7d6
--- /dev/null
+++ b/www/application/views/jobs/uploads/upload_files.php
@@ -0,0 +1,120 @@
+<!--begin::Card toolbar-->
+<div class="card-toolbar">
+    <!--begin::Toolbar-->
+    <div class="d-flex justify-content-start" data-kt-filemanager-table-toolbar="base">
+
+        <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#kt_modal_upload">
+            <!--begin::Svg Icon | path: icons/duotune/files/fil018.svg-->
+            <span class="svg-icon svg-icon-2">
+													<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+														<path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="black" />
+														<path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="black" />
+														<path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="black" />
+													</svg>
+												</span>
+            <!--end::Svg Icon-->Upload Files</button>
+        <!--end::Add customer-->
+    </div>
+    <!--end::Toolbar-->
+    <!--begin::Group actions-->
+    <div class="d-flex justify-content-end align-items-center d-none" data-kt-filemanager-table-toolbar="selected">
+        <div class="fw-bolder me-5">
+            <span class="me-2" data-kt-filemanager-table-select="selected_count"></span>Selected</div>
+        <button type="button" class="btn btn-danger" data-kt-filemanager-table-select="delete_selected">Delete Selected</button>
+    </div>
+    <!--end::Group actions-->
+</div>
+<!--end::Card toolbar-->
+
+<!--begin::Modal - Upload File-->
+<div class="modal fade" id="kt_modal_upload" tabindex="-1" aria-hidden="true">
+    <!--begin::Modal dialog-->
+    <div class="modal-dialog modal-dialog-centered mw-650px">
+        <!--begin::Modal content-->
+        <div class="modal-content">
+            <!--begin::Form-->
+            <form class="form" action="none" id="kt_modal_upload_form">
+                <!--begin::Modal header-->
+                <div class="modal-header">
+                    <!--begin::Modal title-->
+                    <h2 class="fw-bolder">Upload files</h2>
+                    <!--end::Modal title-->
+                    <!--begin::Close-->
+                    <div class="btn btn-icon btn-sm btn-active-icon-primary" data-bs-dismiss="modal">
+                        <!--begin::Svg Icon | path: icons/duotune/arrows/arr061.svg-->
+                        <span class="svg-icon svg-icon-1">
+                            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                            <rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1" transform="rotate(-45 6 17.3137)" fill="black" />
+                            <rect x="7.41422" y="6" width="16" height="2" rx="1" transform="rotate(45 7.41422 6)" fill="black" />
+                            </svg>
+                        </span>
+                        <!--end::Svg Icon-->
+                    </div>
+                    <!--end::Close-->
+                </div>
+                <!--end::Modal header-->
+                <!--begin::Modal body-->
+                <div class="modal-body pt-10 pb-15 px-lg-17">
+                    <!--begin::Input group-->
+                    <div class="form-group">
+                        <!--begin::Dropzone-->
+                        <div class="dropzone dropzone-queue mb-2" id="kt_modal_upload_dropzone">
+                            <!--begin::Controls-->
+                            <div class="dropzone-panel mb-4">
+                                <a class="dropzone-select btn btn-sm btn-primary me-2">Attach files</a>
+                                <a class="dropzone-upload btn btn-sm btn-light-primary me-2">Upload All</a>
+                                <a class="dropzone-remove-all btn btn-sm btn-light-primary">Remove All</a>
+                            </div>
+                            <!--end::Controls-->
+                            <!--begin::Items-->
+                            <div class="dropzone-items wm-200px">
+                                <div class="dropzone-item p-5" style="display:none">
+                                    <!--begin::File-->
+                                    <div class="dropzone-file">
+                                        <div class="dropzone-filename text-dark" title="some_image_file_name.jpg">
+                                            <span data-dz-name="">some_image_file_name.jpg</span>
+                                            <strong>(
+                                                <span data-dz-size="">340kb</span>)</strong>
+                                        </div>
+                                        <div class="dropzone-error mt-0" data-dz-errormessage=""></div>
+                                    </div>
+                                    <!--end::File-->
+                                    <!--begin::Progress-->
+                                    <div class="dropzone-progress">
+                                        <div class="progress bg-light-primary">
+                                            <div class="progress-bar bg-primary" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" data-dz-uploadprogress=""></div>
+                                        </div>
+                                    </div>
+                                    <!--end::Progress-->
+                                    <!--begin::Toolbar-->
+                                    <div class="dropzone-toolbar">
+																		<span class="dropzone-start">
+																			<i class="bi bi-play-fill fs-3"></i>
+																		</span>
+                                        <span class="dropzone-cancel" data-dz-remove="" style="display: none;">
+																			<i class="bi bi-x fs-3"></i>
+																		</span>
+                                        <span class="dropzone-delete" data-dz-remove="">
+																			<i class="bi bi-x fs-1"></i>
+																		</span>
+                                    </div>
+                                    <!--end::Toolbar-->
+                                </div>
+                            </div>
+                            <!--end::Items-->
+                        </div>
+                        <!--end::Dropzone-->
+                        <!--begin::Hint-->
+                        <span class="form-text fs-6 text-muted">Max file size is 1MB per file.</span>
+                        <!--end::Hint-->
+                    </div>
+                    <!--end::Input group-->
+                </div>
+                <!--end::Modal body-->
+            </form>
+            <!--end::Form-->
+        </div>
+    </div>
+</div>
+<!--end::Modal - Upload File-->
+
diff --git a/www/application/views/jobs/view_jobgroup.php b/www/application/views/jobs/view_jobgroup.php
index 353b34a0..43468952 100644
--- a/www/application/views/jobs/view_jobgroup.php
+++ b/www/application/views/jobs/view_jobgroup.php
@@ -1,35 +1,48 @@
-<!-- Main content -->
-<div class="content-wrapper">
-    <?php include('common/jobstrip.php'); ?>
+<?php include('common/jobstrip.php'); ?>
+<div class="row g-5 g-xl-8">
 
-    <div class="panel panel-flat">
+    <?php include('common/jobside.php'); ?>
+    <div class="col-xl-9">
 
-        <div class="panel-heading">
-            <h6 class="panel-title">my Preferred List</h6>
-            <div class="heading-elements">
-                <span class="label bg-success heading-text">Use "Preferred List" to create the list of users you prefer to send your offers.</span>       
+        <!--begin::Tables Widget 12-->
+        <div class="card mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    <span class="card-label fw-bolder fs-3 mb-1">Job Group</span>
+                    <span class="text-muted mt-1 fw-bold fs-7">Use "Preferred List" to create the list of users you prefer to send your offers</span>
+                </h3>
+                <div class="card-toolbar">
+                 
+                </div>
             </div>
-        </div>
+            <!--end::Header-->
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <!--begin::Table container-->
+                <div class="table-responsive">
+                  
+                
 
-    </div>
-
-    <div class="panel panel-flat" style="height: 580px;">
-        <div class="panel-heading">
-
-           
-
-            <div class="row">
-                <div class="col-lg-4">
+                <div class="row">
+                <div class="col-lg-4" style="background-color:aliceblue;">
+                    
                     <form name='addgrp' method='POST' action='/jobs/jobgrp'>              
-                        <div class="form-group">
-                            <div class="col-lg-8">
-                                <input type="text" name="group_name" value='' maxlength="25" class='form-control'  placeholder='New Group Name...' >
+                        <div class="form-group" style="background-color:white;">
+                            <div class="row">    
+                                    <input type="text" name="group_name" value='' maxlength="25" class='form-control form-control-lg form-control-solid'  placeholder='New Group Name...' >
+                                                               
                             </div>
-                            <div class="col-lg-4">
-                                <input type="submit" class="btn btn-primary btn-xs" name='addgrop' value='Add Group'>                  
+                            <div class="row">    
+                                <div class="col-lg-8">
+                                </div>
+                                <div class="col-lg-4">
+                                    <input type="submit" class="btn btn-primary btn-sm w-140 mb-5" name='addgrop' value='Add Group'>                  
+                                </div>
                             </div>
                         </div>
                     </form>
+
                     <p>
                         <?php echo $group_table; ?>
                 </div>
@@ -40,13 +53,27 @@
                     </div>
                 </div>
             </div>
-            
-             <div id="job_message"><?php echo $job_message; ?></div>
+
+
+
+
+
+
+
+
+
+                </div>
+
+
+                <div class="d-flex flex-stack flex-wrap pt-10" style="text-align:center;">
+                <div id="job_message"><?php echo $job_message; ?></div>
+                </div>
+
+            </div>
         </div>
     </div>
-
 </div>
-<!-- /main content -->
+
 <form method="post" name="deljobgrp" action="/jobs/jobgrp">
     <input type="hidden" name="del" value="">
 </form>
diff --git a/www/application/views/jobs/view_startcreate.php b/www/application/views/jobs/view_startcreate.php
index 2eae764a..75bed1a7 100644
--- a/www/application/views/jobs/view_startcreate.php
+++ b/www/application/views/jobs/view_startcreate.php
@@ -115,4 +115,4 @@
 
     </div>
 </div>
-
+</div>
diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php
index a18bb711..efe66703 100644
--- a/www/application/views/jobs/view_thisjob.php
+++ b/www/application/views/jobs/view_thisjob.php
@@ -97,9 +97,14 @@
                                 
                                 <tbody>
                                     <tr>
-                                        <td style="width: 40%;"><div id="sendmessagenote"></div></td>
-                                        <td style="width: 30%; text-align:right;"> <button id='btn_cancel' name='btn_cancel' type="submit" class="btn btn-danger btn-sm" onclick="document.message.ajax.value = '0';">Cancel</button></td>
-                                        <td style="width: 30%; text-align:right;"><button id='btm_submit' name='btn_submit' type="submit" class="btn btn-primary btn-sm" onclick="SendMessage();return false;">Send Message</button> </td>
+                                        <td style="text-align: left;">
+                                            <?php
+                                            include 'uploads/upload_files.php';
+                                            ?>
+                                        </td>
+                                        <td style="width: 30%;"><div id="sendmessagenote"></div></td>
+                                        <td style="width: 20%; text-align:right;"> <button id='btn_cancel' name='btn_cancel' type="submit" class="btn btn-danger btn-sm" onclick="document.message.ajax.value = '0';">Cancel</button></td>
+                                        <td style="width: 20%; text-align:right;"><button id='btm_submit' name='btn_submit' type="submit" class="btn btn-primary btn-sm" onclick="SendMessage();return false;">Send Message</button> </td>
                                     </tr>
                                 </tbody>
                         </table>
diff --git a/www/application/views/site3/internal/template/view_securefooter.php b/www/application/views/site3/internal/template/view_securefooter.php
index 4eaf1e92..98717a53 100644
--- a/www/application/views/site3/internal/template/view_securefooter.php
+++ b/www/application/views/site3/internal/template/view_securefooter.php
@@ -64,7 +64,7 @@
 
 <script src="/site3/assets/js/custom/fullcalendar/fullcalendar.bundle.js"></script>
 <script src="/site3/assets/js/custom/datatables/datatables.bundle.js"></script>
-
+<script src="/site3/assets/js/custom/files/list.js"></script>
 <script src="/site3/assets/js/custom/calendar/calendar.js"></script>
 <!--end::Page Custom Javascript-->
 <!--end::Javascript-->