adding pending and text search to list

adding active flag to edit view and adding search items to the list view

diff --git a/classes/data/dataJobs.php b/classes/data/dataJobs.php
index 40d8f00..e630193 100644 (file)
--- a/classes/data/dataJobs.php
+++ b/classes/data/dataJobs.php
@@ -189,8 +189,8 @@ class GlmDataJobs extends GlmDataAbstract
                 'type' => 'datetime',
                 'use' => 'lge'
             ),
-            'visible' => array (
-                'field' => 'visible',
+            'active' => array (
+                'field' => 'active',
                 'type' => 'checkbox',
                 'use' => 'a'
             ),
@@ -247,7 +247,6 @@ class GlmDataJobs extends GlmDataAbstract
                 'type' => 'text',
                 'use' => 'a'
             ),
-
             'member' => array (
                 'field' => 'member',
                 'type' => 'pointer',

diff --git a/config/plugin.ini b/config/plugin.ini
index 4bf5d8f..c08a74e 100644 (file)
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -9,4 +9,7 @@
 ; Entry Status Types
 ;
 job_expiration[30] = '30 Days'
-job_expiration[60] = '60 Days'
\ No newline at end of file
+job_expiration[60] = '60 Days'
+
+status[10] = 'Pending'
+status[20] = 'Approved'
\ No newline at end of file

diff --git a/css/admin.css b/css/admin.css
index 0001095..296c106 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -1,3 +1,3 @@
-body #glm-admin-content-container .admin-new-job{margin-bottom:15px}body #glm-admin-content-container .admin-new-job .admin-new-job-link{padding:5px;background:#3D84D0;color:white;text-decoration:none;border-radius:4px}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-label,body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-input,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-label,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-input{padding:0}body #glm-admin-content-container .admin-edit-job-wrapper .job-title-label,body #glm-admin-content-container .admin-job-list-wrapper .job-title-label{padding-left:20px}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list{padding:6px 0px 6px 2px}body #glm-admin-content-container .admin-edit-job-wrapper .jobTitle-record,body #glm-admin-content-container .admin-job-list-wrapper .jobTitle-record{float:left}body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-item,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-item{padding:5px}body #glm-admin-content-container .admin-edit-job-wrapper .no-padding,body #glm-admin-content-container .admin-job-list-wrapper .no-padding{padding:0}body #glm-admin-content-container .admin-edit-job-wrapper .no-margin,body #glm-admin-content-container .admin-job-list-wrapper .no-margin{margin:0}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-header,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-header{margin-bottom:20px;padding-bottom:2px;border-bottom:1px solid lightgray}body #glm-admin-content-container .admin-edit-job-wrapper .job-company-list-header,body #glm-admin-content-container .admin-edit-job-wrapper .job-date-list-header,body #glm-admin-content-container .admin-edit-job-wrapper .job-title-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-company-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-date-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-title-list-header{font-weight:bold;font-size:16px}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-row:nth-child(odd),body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-row:nth-child(odd){background:#e3e3e5}body #glm-admin-content-container .admin-edit-job-wrapper .glm-row,body #glm-admin-content-container .admin-job-list-wrapper .glm-row{margin:0}body #glm-admin-content-container .admin-edit-job-wrapper .glm-job-row,body #glm-admin-content-container .admin-job-list-wrapper .glm-job-row{margin-bottom:10px}@media screen and (max-width: 641px){body #glm-admin-content-container .admin-edit-job-wrapper,body #glm-admin-content-container .admin-job-list-wrapper{float:none}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-header,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-header{display:none}body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-items,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-items{margin:0 auto;float:right;max-width:100px}}@media (min-width: 639px) and (max-width: 1025px){body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-header,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-header{display:none}body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-items,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-items{margin:0 auto;float:right;max-width:100px}}@media (min-width: 1023px){body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-items,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-items{position:absolute;right:0;max-width:100px;float:right}}@media (max-width: 1025px){body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-data div,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-data div{margin-bottom:5px}}
+body #glm-admin-content-container #job-pending-search{margin-top:3px}body #glm-admin-content-container .admin-new-job{margin-bottom:15px;clear:both}body #glm-admin-content-container .admin-new-job .admin-new-job-link{padding:5px;background:#3D84D0;color:white;text-decoration:none;border-radius:4px}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-label,body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-input,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-label,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-input{padding:0}body #glm-admin-content-container .admin-edit-job-wrapper .job-title-label,body #glm-admin-content-container .admin-job-list-wrapper .job-title-label{padding-left:20px}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list{padding:6px 0px 6px 2px}body #glm-admin-content-container .admin-edit-job-wrapper .jobTitle-record,body #glm-admin-content-container .admin-job-list-wrapper .jobTitle-record{float:left}body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-item,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-item{padding:5px}body #glm-admin-content-container .admin-edit-job-wrapper .no-padding,body #glm-admin-content-container .admin-job-list-wrapper .no-padding{padding:0}body #glm-admin-content-container .admin-edit-job-wrapper .no-margin,body #glm-admin-content-container .admin-job-list-wrapper .no-margin{margin:0}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-header,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-header{margin-bottom:20px;padding-bottom:2px;border-bottom:1px solid lightgray}body #glm-admin-content-container .admin-edit-job-wrapper .job-company-list-header,body #glm-admin-content-container .admin-edit-job-wrapper .job-date-list-header,body #glm-admin-content-container .admin-edit-job-wrapper .job-title-list-header,body #glm-admin-content-container .admin-edit-job-wrapper .job-active-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-company-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-date-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-title-list-header,body #glm-admin-content-container .admin-job-list-wrapper .job-active-list-header{font-weight:bold;font-size:16px}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-row:nth-child(odd),body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-row:nth-child(odd){background:#e3e3e5}body #glm-admin-content-container .admin-edit-job-wrapper .glm-row,body #glm-admin-content-container .admin-job-list-wrapper .glm-row{margin:0}body #glm-admin-content-container .admin-edit-job-wrapper .glm-job-row,body #glm-admin-content-container .admin-job-list-wrapper .glm-job-row{margin-bottom:10px}@media screen and (max-width: 641px){body #glm-admin-content-container .admin-edit-job-wrapper,body #glm-admin-content-container .admin-job-list-wrapper{float:none}body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-header,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-header{display:none}body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-items,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-items{margin:0 auto;float:right;max-width:100px}}@media (min-width: 639px) and (max-width: 1025px){body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-list-header,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-list-header{display:none}body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-items,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-items{margin:0 auto;float:right;max-width:100px}}@media (min-width: 1023px){body #glm-admin-content-container .admin-edit-job-wrapper .admin-list-edit-items,body #glm-admin-content-container .admin-job-list-wrapper .admin-list-edit-items{position:absolute;right:0;max-width:100px;float:right}}@media (max-width: 1025px){body #glm-admin-content-container .admin-edit-job-wrapper .admin-job-data div,body #glm-admin-content-container .admin-job-list-wrapper .admin-job-data div{margin-bottom:5px}}
 
 /*# sourceMappingURL=admin.css.map */

diff --git a/css/admin.css.map b/css/admin.css.map
index 6a04aa8..53b36d5 100644 (file)
--- a/css/admin.css.map
+++ b/css/admin.css.map
@@ -1 +1 @@
-{"version":3,"file":"admin.css","sources":["admin.scss"],"sourcesContent":["body{\n    #glm-admin-content-container{ \n        .admin-new-job{\n            margin-bottom: 15px;\n        }\n        .admin-new-job .admin-new-job-link{\n            padding: 5px;\n            background: #3D84D0;\n            color: white;\n            text-decoration: none;\n            border-radius: 4px;\n        }\n        .admin-edit-job-wrapper,\n        .admin-job-list-wrapper{\n            .admin-job-label,\n            .admin-job-input {\n                padding: 0;\n            }\n            .job-title-label{\n                padding-left: 20px;\n            }\n            .admin-job-list{\n                padding: 6px 0px 6px 2px;\n            }\n            .jobTitle-record{\n                float: left;\n            }\n            .admin-list-edit-item{\n                // float: right;\n                padding: 5px;\n            }\n            \n            \n            .no-padding{\n                padding: 0;\n            }\n            .no-margin{\n                margin: 0;\n            }\n            .admin-job-list-header{\n                margin-bottom: 20px;\n                padding-bottom: 2px;\n                border-bottom: 1px solid lightgray;\n            }\n            .admin-job-list-row{\n                // padding-bottom: 5px;\n            /*    border-bottom: 1px solid lightgray;*/\n            }\n            .job-company-list-header,.job-date-list-header, .job-title-list-header{\n                font-weight: bold;\n                font-size: 16px;\n            }\n            .job-company-list{\n                // padding: 0 3px 0 0;\n            }\n            .admin-job-list-row:nth-child(odd){\n                background: #e3e3e5;\n            }\n\n        // VIEW PORT MEDIA QUERIES\n\n            .glm-row{\n                margin: 0;\n            }\n            .glm-job-row{\n                margin-bottom: 10px;\n            }\n\n            // small only\n            @media screen and (max-width: 641px){\n                .admin-job-list-header{\n                    display: none;\n                }\n\n                float: none;\n                .admin-list-edit-items{\n                    margin: 0 auto;\n                    float: right;\n                    max-width: 100px;\n                }\n            }\n            // medium only\n            @media (min-width: 639px) and (max-width: 1025px){\n                .admin-job-list-header{\n                    display: none;\n                }\n                .admin-list-edit-items{\n                    margin: 0 auto;\n                    float: right;\n                    max-width: 100px;\n                }\n            }\n            // large only\n            @media (min-width: 1023px){\n                .admin-list-edit-items{\n                    position: absolute;\n                    right: 0;\n                    max-width: 100px;\n                    float: right;\n                }\n            }\n            // medium down\n            @media (max-width: 1025px){\n                .admin-job-data{\n                    div{\n                        margin-bottom: 5px;\n                    }\n                }\n            }\n        }\n    }\n}\n"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"admin.css","sources":["admin.scss"],"sourcesContent":["body{\n    #glm-admin-content-container{ \n        #job-pending-search{\n            margin-top: 3px;\n        }\n        .admin-new-job{\n            margin-bottom: 15px;\n            clear: both;\n        }\n        .admin-new-job .admin-new-job-link{\n            padding: 5px;\n            background: #3D84D0;\n            color: white;\n            text-decoration: none;\n            border-radius: 4px;\n        }\n        .admin-edit-job-wrapper,\n        .admin-job-list-wrapper{\n            .admin-job-label,\n            .admin-job-input {\n                padding: 0;\n            }\n            .job-title-label{\n                padding-left: 20px;\n            }\n            .admin-job-list{\n                padding: 6px 0px 6px 2px;\n            }\n            .jobTitle-record{\n                float: left;\n            }\n            .admin-list-edit-item{\n                // float: right;\n                padding: 5px;\n            }\n            \n            \n            .no-padding{\n                padding: 0;\n            }\n            .no-margin{\n                margin: 0;\n            }\n            .admin-job-list-header{\n                margin-bottom: 20px;\n                padding-bottom: 2px;\n                border-bottom: 1px solid lightgray;\n            }\n            .admin-job-list-row{\n                // padding-bottom: 5px;\n            /*    border-bottom: 1px solid lightgray;*/\n            }\n            .job-company-list-header,.job-date-list-header, .job-title-list-header,.job-active-list-header{\n                font-weight: bold;\n                font-size: 16px;\n            }\n            .job-company-list{\n                // padding: 0 3px 0 0;\n            }\n            .admin-job-list-row:nth-child(odd){\n                background: #e3e3e5;\n            }\n\n        // VIEW PORT MEDIA QUERIES\n\n            .glm-row{\n                margin: 0;\n            }\n            .glm-job-row{\n                margin-bottom: 10px;\n            }\n\n            // small only\n            @media screen and (max-width: 641px){\n                .admin-job-list-header{\n                    display: none;\n                }\n\n                float: none;\n                .admin-list-edit-items{\n                    margin: 0 auto;\n                    float: right;\n                    max-width: 100px;\n                }\n            }\n            // medium only\n            @media (min-width: 639px) and (max-width: 1025px){\n                .admin-job-list-header{\n                    display: none;\n                }\n                .admin-list-edit-items{\n                    margin: 0 auto;\n                    float: right;\n                    max-width: 100px;\n                }\n            }\n            // large only\n            @media (min-width: 1023px){\n                .admin-list-edit-items{\n                    position: absolute;\n                    right: 0;\n                    max-width: 100px;\n                    float: right;\n                }\n            }\n            // medium down\n            @media (max-width: 1025px){\n                .admin-job-data{\n                    div{\n                        margin-bottom: 5px;\n                    }\n                }\n            }\n        }\n    }\n}\n"],"names":[],"mappings":"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"}
\ No newline at end of file

diff --git a/defines.php b/defines.php
index 32248a8..5cc8390 100644 (file)
--- a/defines.php
+++ b/defines.php
@@ -14,7 +14,7 @@ define('GLM_MEMBERS_JOBS_PLUGIN_SLUG', 'glm-member-db-jobs');
 // Database table prefixes - change if using add-on tables
 global $wpdb;
 define('GLM_MEMBERS_JOBS_PLUGIN_DB_PREFIX', $wpdb->prefix.'glm_membersJobs_');
-define('GLM_MEMBERS_JOBS_PLUGIN_ACTIVE_DB_OPTION', 'glmMembersjobsDbVersion');
+define('GLM_MEMBERS_JOBS_PLUGIN_ACTIVE_DB_OPTION', 'glmMembersJobsDbVersion');
 
 // Determine which system we're running on - If not provided, assume PRODUCTION
 $host = getenv('GLM_HOST_ID');

diff --git a/index.php b/index.php
index 0d80aa2..ab8f507 100644 (file)
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_JOBS_PLUGIN_VERSION', '0.0.1');
-define('GLM_MEMBERS_JOBS_PLUGIN_DB_VERSION', '0.0.1');
+define('GLM_MEMBERS_JOBS_PLUGIN_DB_VERSION', '0.0.2');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_JOBS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0');

diff --git a/models/admin/jobs/index.php b/models/admin/jobs/index.php
index 7f70a04..3b95e66 100644 (file)
--- a/models/admin/jobs/index.php
+++ b/models/admin/jobs/index.php
@@ -109,8 +109,12 @@ class GlmMembersAdmin_jobs_index extends GlmDataJobs
         $isModerated        = false;
         $memberID           = false;
         $haveMember         = false;
-        $where              = '';
-
+        $where              = ' TRUE ';
+        
+      
+        $isPending  = ( !empty( $_REQUEST['pending-job'] ) ) ? true : false;
+        $textSearch = ( !empty( $_REQUEST['text-search'] ) ) ? filter_var($_REQUEST['text-search'], FILTER_SANITIZE_STRING) : false;
+        
         // Check if there's a logged in user who is locked to their own entity
         $lockedToMember = apply_filters('glm_members_locked_to_member_id', false);
         if ($lockedToMember) {
@@ -141,7 +145,6 @@ class GlmMembersAdmin_jobs_index extends GlmDataJobs
                 );
             }
         }
-
         // If not a valid member ID
         if ($memberID > 0) {
 
@@ -166,7 +169,14 @@ class GlmMembersAdmin_jobs_index extends GlmDataJobs
             }
 
         }
-
+        
+        if($isPending){
+            $where .= " AND active = 0 ";
+        }
+        else if($textSearch){
+            $where .= " AND (title LIKE '%$textSearch%' OR company LIKE '%$textSearch%') ";
+        }
+  
         if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') {
             $option = $_REQUEST['option'];
         }
@@ -182,7 +192,7 @@ class GlmMembersAdmin_jobs_index extends GlmDataJobs
                 $this->job_id = false;
             }
         }
-        
+      
         switch ($option) {
 
             case 'add':
@@ -279,8 +289,9 @@ class GlmMembersAdmin_jobs_index extends GlmDataJobs
                 $job_data = $this->getList();
                 break;
             default:
-                $job_data = $this->getList($where, 'post_date DESC');
+                $job_data = $this->getList($where, "post_date DESC");
                 $view_file = 'index';
+                
                 break;
         }
 //        echo '<pre>', print_r($member_list), '</pre>';
@@ -300,6 +311,8 @@ class GlmMembersAdmin_jobs_index extends GlmDataJobs
             'jobAddError'    => $jobAddError,
             'option'         => $option,
             'job'            => $job,
+            'isPending'      => $isPending,
+            'textSearch'     => $textSearch,
             'assetsUrl'      => GLM_MEMBERS_JOBS_PLUGIN_URL . 'assets/',
             
         );

diff --git a/scss/admin.scss b/scss/admin.scss
index 2ed51a2..e54302d 100644 (file)
--- a/scss/admin.scss
+++ b/scss/admin.scss
@@ -1,7 +1,11 @@
 body{
     #glm-admin-content-container{ 
+        #job-pending-search{
+            margin-top: 3px;
+        }
         .admin-new-job{
             margin-bottom: 15px;
+            clear: both;
         }
         .admin-new-job .admin-new-job-link{
             padding: 5px;
@@ -46,7 +50,7 @@ body{
                 // padding-bottom: 5px;
             /*    border-bottom: 1px solid lightgray;*/
             }
-            .job-company-list-header,.job-date-list-header, .job-title-list-header{
+            .job-company-list-header,.job-date-list-header, .job-title-list-header,.job-active-list-header{
                 font-weight: bold;
                 font-size: 16px;
             }

diff --git a/setup/databaseScripts/create_database_V0.0.1.sql b/setup/databaseScripts/create_database_V0.0.1.sql
deleted file mode 100644 (file)
index 7ca740c..0000000
--- a/setup/databaseScripts/create_database_V0.0.1.sql
+++ /dev/null
@@ -1,68 +0,0 @@
--- Gaslight Media Members Database - Job Postings
--- File Created: 12/02/15 15:27:15
--- Database Version: 0.0.2
--- Database Creation Script
---
--- This file is called to create a new set of tables for this
--- add-on for the most receint database version for this add-on.
---
--- There should only be one such file in this directory
---
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
-
--- Conditions Table
-CREATE TABLE {prefix}jobs (
-    id INT NOT NULL AUTO_INCREMENT,
-    old_id int NULL ,
-    title int NULL ,
-    descr TEXT NULL ,
-    salary TINYTEXT NULL ,
-    email_location TINYTEXT NULL ,
-    resume_location TINYTEXT NULL ,
-    contact_name TINYTEXT NULL ,
-    contact_phone TINYTEXT NULL ,
-    post_date DATETIME NULL,
-    updated DATETIME NULL,
-    visible BOOL NULL,
-    facility_operation TEXT NULL,
-    requirements TEXT NULL,
-    benefits TEXT NULL ,
-    job_location TINYTEXT NULL ,
-    job_expiration INT NULL,
-    duration TINYTEXT NULL ,
-    deadline TINYTEXT NULL ,
-    company TINYTEXT NULL ,
-    repost TINYTEXT NULL ,
-    position_available TINYTEXT NULL ,
-    member INT NULL,
-    PRIMARY KEY (id)
-);
-
-----
-
--- Job Titles
-CREATE TABLE {prefix}job_titles (
-  id INT NOT NULL AUTO_INCREMENT,
-  old_id INT NULL,
-  job_title TINYTEXT NULL ,
-  PRIMARY KEY (id)
-);
-
-----
-
--- Job Titles default entries in table
--- INSERT INTO {prefix}job_titles ( id,old_id,job_title) VALUES
--- (1,1, 'Supervisor'),(2,1,'Groundskeeper'),(3,1,'Janitor');
-
-----
-
--- Job Titles default entries in table
--- INSERT INTO {prefix}jobs ( 
--- id,old_id,title,descr,salary, email_location,resume_location,contact_name,contact_phone,post_date,updated,visible, 
--- facility_operation,requirements,job_location,job_expiration,duration,deadline,position_available,
--- company,member,benefits
--- ) VALUES ( 1,1, 1,"DESCRIPTION",'SALARY', 'EMAIL LOCATION', 'RESUME LOCATION','CONTACT NAME', '453-3443', NOW(),NOW(), true,
--- 'facility operations', 'REQUIREMENTS', 'JOB LOCATION', 30, 'JOB DURATION', 'DEADLINE', 'POSITION AVAILABLE',
--- 'COMPANY', 1, 'JOB BENEFITS'
--- );
\ No newline at end of file

diff --git a/setup/databaseScripts/create_database_V0.0.2.sql b/setup/databaseScripts/create_database_V0.0.2.sql
new file mode 100644 (file)
index 0000000..f6e24fd
--- /dev/null
+++ b/setup/databaseScripts/create_database_V0.0.2.sql
@@ -0,0 +1,68 @@
+-- Gaslight Media Members Database - Job Postings
+-- File Created: 11/20/17 15:27:15
+-- Database Version: 0.0.2
+-- Database Creation Script
+--
+-- This file is called to create a new set of tables for this
+-- add-on for the most receint database version for this add-on.
+--
+-- There should only be one such file in this directory
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+-- Conditions Table
+CREATE TABLE {prefix}jobs (
+    id INT NOT NULL AUTO_INCREMENT,
+    old_id int NULL ,
+    title int NULL ,
+    descr TEXT NULL ,
+    salary TINYTEXT NULL ,
+    email_location TINYTEXT NULL ,
+    resume_location TINYTEXT NULL ,
+    contact_name TINYTEXT NULL ,
+    contact_phone TINYTEXT NULL ,
+    post_date DATETIME NULL,
+    updated DATETIME NULL,
+    active BOOL NULL,
+    facility_operation TEXT NULL,
+    requirements TEXT NULL,
+    benefits TEXT NULL ,
+    job_location TINYTEXT NULL ,
+    job_expiration INT NULL,
+    duration TINYTEXT NULL ,
+    deadline TINYTEXT NULL ,
+    company TINYTEXT NULL ,
+    repost TINYTEXT NULL ,
+    position_available TINYTEXT NULL ,
+    member INT NULL,
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Job Titles
+CREATE TABLE {prefix}job_titles (
+  id INT NOT NULL AUTO_INCREMENT,
+  old_id INT NULL,
+  job_title TINYTEXT NULL ,
+  PRIMARY KEY (id)
+);
+
+----
+
+-- Job Titles default entries in table
+-- INSERT INTO {prefix}job_titles ( id,old_id,job_title) VALUES
+-- (1,1, 'Supervisor'),(2,1,'Groundskeeper'),(3,1,'Janitor');
+
+----
+
+-- Job Titles default entries in table
+-- INSERT INTO {prefix}jobs ( 
+-- id,old_id,title,descr,salary, email_location,resume_location,contact_name,contact_phone,post_date,updated,visible, 
+-- facility_operation,requirements,job_location,job_expiration,duration,deadline,position_available,
+-- company,member,benefits
+-- ) VALUES ( 1,1, 1,"DESCRIPTION",'SALARY', 'EMAIL LOCATION', 'RESUME LOCATION','CONTACT NAME', '453-3443', NOW(),NOW(), true,
+-- 'facility operations', 'REQUIREMENTS', 'JOB LOCATION', 30, 'JOB DURATION', 'DEADLINE', 'POSITION AVAILABLE',
+-- 'COMPANY', 1, 'JOB BENEFITS'
+-- );
\ No newline at end of file

diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index bd688f0..9e0928b 100644 (file)
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -3,7 +3,7 @@
  * Gaslight Media Members Database
  * GLM Members Job Postings DB Versions
  *
- * PHP version 5.5
+ * PHP version 7.0
  *
  * @category glmWordPressPlugin
  * @package  glmMembersDatabase
@@ -35,4 +35,5 @@
 
 $glmMembersjobsDbVersions = array(
     '0.0.1' => array('version' => '0.0.1', 'tables' => 2, 'date' => '09/08/2017'),
+    '0.0.2' => array('version' => '0.0.2', 'tables' => 2, 'date' => '11/21/2017'),
 );

diff --git a/setup/databaseScripts/update_database_V0.0.1.sql b/setup/databaseScripts/update_database_V0.0.1.sql
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/setup/databaseScripts/update_database_V0.0.1.sql
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/setup/databaseScripts/update_database_V0.0.2.sql b/setup/databaseScripts/update_database_V0.0.2.sql
new file mode 100644 (file)
index 0000000..329a414
--- /dev/null
+++ b/setup/databaseScripts/update_database_V0.0.2.sql
@@ -0,0 +1,11 @@
+-- Gaslight Media Members Database  - Jobs Add-On
+-- File Created: 11/09/17 15:27:15
+-- Database Version: 0.0.2
+-- Database Update From Previous Version Script
+-- 
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashses
+
+
+-- Add Status
+ALTER TABLE {prefix}jobs CHANGE COLUMN visible active TINYINT;
\ No newline at end of file

diff --git a/views/admin/jobs/edit.html b/views/admin/jobs/edit.html
index 866f3cf..341391d 100644 (file)
--- a/views/admin/jobs/edit.html
+++ b/views/admin/jobs/edit.html
@@ -3,14 +3,11 @@
 
     {if ($option == 'add' || $haveJob)}
         <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="button button-secondary glm-button glm-right">Return to jobs List</a>
-
     {if $option == 'edit' || $option == 'update'}
         <a id="deleteJobButton" class="button button-secondary glm-button glm-right">Delete this Job</a>
         <h2>Edit Job Posting
     {else}
-        
-        <h2>Add New Job Posting
-            
+        <h2>Add New Job Posting 
     {/if}
             &nbsp;&nbsp;&nbsp;
             {if $jobUpdated}<span class="glm-notice glm-flash-updated">Job Updated</span>{/if}
@@ -38,7 +35,24 @@
         <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
             <a id="glm-Job-descr" data-show-table="glm-table-descr" class="glm-Job-tab nav-tab nav-tab-active">Job Postings</a>
         </h2>
-       
+            <!-- ACTIVE -->
+            <div class="glm-job-row glm-row">
+                <div class="glm-small-12 glm-medium-2 glm-columns admin-job-label">
+                        Visible
+                </div>
+                <div class="glm-small-12 glm-medium-5 glm-columns admin-job-input">
+                        <input id="job-active" data-id="job-active" type="checkbox" name="active" class="active-checkbox" {if $job.fieldData.active.value} checked{/if}>
+                </div>
+            </div>
+            <!-- RE-POST -->
+            <div class="glm-job-row glm-row">
+                <div class="glm-small-12 glm-medium-2 glm-columns admin-job-label ">
+                    Re-Post <br> (restart expiration interval)
+                </div>
+                <div class="glm-small-12 glm-medium-5 glm-columns admin-job-input">
+                    <input id="item-repost" data-id="item-repost" type="checkbox" name="repost" class="repost-checkbox">
+                </div>
+            </div>
             <!-- JOB TITLE -->
             <div class="glm-job-row glm-row">
                 <div class="glm-small-12 glm-medium-2 glm-columns admin-job-label ">
@@ -301,15 +315,7 @@
                     <input type="text" name="contact_phone" {if $job.fieldData.contact_phone} value='{$job.fieldData.contact_phone}' {/if}>
                 </div>
             </div>
-        <!-- VISIBLE -->
-            <div class="glm-job-row glm-row">
-                <div class="glm-small-12 glm-medium-2 glm-columns admin-job-label">
-                        Visible
-                </div>
-                <div class="glm-small-12 glm-medium-5 glm-columns admin-job-input">
-                        <input id="job-visible" data-id="job-visible" type="checkbox" name="visible" class="visible-checkbox" {if $job.fieldData.visible.value} checked{/if}>
-                </div>
-            </div>
+        
             <!-- JOB EXPIRATION-->
             <div class="glm-job-row glm-row">
                 <div class="glm-small-12 glm-medium-2 glm-columns admin-job-label">
@@ -330,15 +336,7 @@
                     </select>
                 </div>
             </div>
-            <!-- RE-POST -->
-            <div class="glm-job-row glm-row">
-                <div class="glm-small-12 glm-medium-2 glm-columns admin-job-label ">
-                    Re-Post <br> (restart expiration interval)
-                </div>
-                <div class="glm-small-12 glm-medium-5 glm-columns admin-job-input">
-                    <input id="item-repost" data-id="item-repost" type="checkbox" name="repost" class="repost-checkbox">
-                </div>
-            </div>
+            
             
             <input id="updateJob" type="submit" value="{if $haveJob}Update Job{else}Save New Job{/if}">
         </form>

diff --git a/views/admin/jobs/index.html b/views/admin/jobs/index.html
index 64817bf..53e224c 100644 (file)
--- a/views/admin/jobs/index.html
+++ b/views/admin/jobs/index.html
@@ -1,60 +1,94 @@
 {include file='admin/header.html'}
-{if $haveMember}
-<input type="hidden" name="member" value="{$memberID}">
-{if !$lockedToMember}
-<input type="hidden" name="glm_action" value="job">
-{/if}
-<input type="hidden" name="option" value="list">
-{/if}
+<form action="{$thisUrl}?page={$thisPage}" method="post" id="glm-job-search">
+    {if $haveMember}
+        <input type="hidden" name="member" value="{$memberID}">
+        {if !$lockedToMember}
+        <input type="hidden" name="glm_action" value="job">
+        {/if}
+        <input type="hidden" name="option" value="list">
+    {/if}
+    <div id="job-search">
+        <fieldset class="pending-set">
+            <label for="job-search-btn">Pending Only</label>
+            <input id="job-pending-search" type="checkbox" name="pending-job" value="1">
+        </fieldset>
+        <fieldset class="text-set">
+            <input type="text" name="text-search" id="text-search">
+            <input type="submit" id="job-search-btn" value="Text Search">
+        </fieldset>
+        <div class="search-terms">
+            {if $isPending}
+                <span style="font-weight: bold;" id="search-pending">
+                    Pending Only
+                </span>
+            {/if}
+            {if $textSearch}
+                <span style="font-weight: bold;" id="search-term">
+                    Search Term: {$textSearch}
+                </span>
+            {/if}
+        </div>
+    </div>
     <div class="admin-new-job">
         <a class="admin-new-job-link" href="{$thisUrl}?page={$thisPage}&glm_action=index&option=add">New Job Posting</a>
     </div>
-    {if $jobData}
-        <div class="admin-job-list-wrapper">
-            
-            <div class="admin-job-list-header glm-row">
-                <div class="job-title-list-header glm-small-12 glm-large-3 glm-columns no-padding">Job Title</div>
-                <div class="job-company-list-header glm-small-12 glm-large-3 glm-columns no-padding">Company</div>
-                <div class="job-date-list-header glm-small-12 glm-large-3 glm-columns no-padding">Member Name</div>
-                <div class="job-date-list-header glm-small-12 glm-large-3 glm-columns no-padding">Job Post Date</div>
-            </div>
-            {foreach $jobData as $job=>$data}
-            
-                <div class='glm-row admin-job-list-row'>
-                    <div class="glm-small-12 glm-columns admin-job-list">
-                        <div class="glm-row admin-job-data">
-                            <div class="job-title-list glm-small-12 glm-large-3 glm-columns no-padding">
-                                {if $data.title} 
-                                    {$data.title} 
-                                {else} 
-                                    &nbsp; 
-                                {/if}
-                            </div>
-                            <div class="job-company-list glm-small-12 glm-large-3 glm-columns no-padding">
-                                <span>{if $data.company} {$data.company} {else} &nbsp; {/if}</span>
-                            </div>
-                            <div class="job-member-list glm-small-12 glm-large-3 glm-columns no-padding">
-                                {if $data.member} {$data.member} {else} &nbsp; {/if}
-                            </div>
-                            <div class="job-date-list glm-small-12 glm-large-3 glm-columns no-padding">
-                                {$data.updated.timestamp|date_format:"%Y-%m-%d"}
-                            </div>
+{if $jobData}
+    <div class="admin-job-list-wrapper">
+
+        <div class="admin-job-list-header glm-row">
+            <div class="job-active-list-header glm-small-12 glm-large-1 glm-columns no-padding">Active</div>
+            <div class="job-title-list-header glm-small-12 glm-large-3 glm-columns no-padding">Job Title</div>
+            <div class="job-company-list-header glm-small-12 glm-large-4 glm-columns no-padding">Company</div>
+            <div class="job-date-list-header glm-small-12 glm-large-2 glm-columns no-padding">Member Name</div>
+            <div class="job-date-list-header glm-small-12 glm-large-2 glm-columns no-padding">Job Post Date</div>
+        </div>
+        {foreach $jobData as $job=>$data}
+
+            <div class='glm-row admin-job-list-row'>
+                <div class="glm-small-12 glm-columns admin-job-list">
+                    <div class="glm-row admin-job-data">
+                        <div class="job-active-list glm-small-12 glm-large-1 glm-columns no-padding">
+                            {if $data.active.value}
+                                yes
+                            {else}
+                                no
+                            {/if}
+                        </div>
+                        <div class="job-title-list glm-small-12 glm-large-3 glm-columns no-padding">
+                            {if $data.title} 
+                                {$data.title} 
+                            {else} 
+                                &nbsp; 
+                            {/if}
+                        </div>
+                        <div class="job-company-list glm-small-12 glm-large-4 glm-columns no-padding">
+                            <span>{if $data.company} {$data.company} {else} &nbsp; {/if}</span>
+                        </div>
+                        <div class="job-member-list glm-small-12 glm-large-2 glm-columns no-padding">
+                            {if $data.member} {$data.member} {else} &nbsp; {/if}
+                        </div>
+                        <div class="job-date-list glm-small-12 glm-large-2 glm-columns no-padding">
+                            {$data.updated.timestamp|date_format:"%Y-%m-%d"}
                         </div>
-                    </div>
-                    <div class="glm-small-12 glm-columns admin-job-list admin-list-edit-items">
-                        <a class="admin-list-edit-item" href="{$thisUrl}?page={$thisPage}&glm_action=index&option=edit&job={$data.id}">Edit</a>
-                        <a class="admin-list-edit-item" href="{$thisUrl}?page={$thisPage}&glm_action=index&option=delete&job={$data.id}">Delete</a>
                     </div>
                 </div>
-            {/foreach}
-        </div>
-        <script>
-            jQuery(document).ready(function($) {
-              
+                <div class="glm-small-12 glm-columns admin-job-list admin-list-edit-items">
+                    <a class="admin-list-edit-item" href="{$thisUrl}?page={$thisPage}&glm_action=index&option=edit&job={$data.id}">Edit</a>
+                    <a class="admin-list-edit-item" href="{$thisUrl}?page={$thisPage}&glm_action=index&option=delete&job={$data.id}">Delete</a>
+                </div>
+            </div>
+        {/foreach}
+    </div>
+</form>
+    <script>
+        jQuery(document).ready(function($) {
+            $("#job-pending-search").on("change", function(){
+                $("#glm-job-search").submit();
             });
-        </script>
-    {else if}
-        <div class="no-job-data"> No Job Postings</div>
-    {/if}
+        });
+    </script>
+{else if}
+    <div class="no-job-data"> No Job Postings</div>
+{/if}
 {include file='admin/footer.html'}