From 5a71388e339936297e7433324cef295a1c16a7e2 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 7 Dec 2015 16:31:25 -0500
Subject: [PATCH] Updates for the taxonomy names.

Setup defines for these and use theme.
---
 assets/click-here-to-print.jpg   | Bin 0 -> 4267 bytes
 controllers/front.php            |  45 ++++++++++++++++++----
 css/admin-print-application.css  |   4 +-
 glm-employment.php               |   4 ++
 models/job.php                   |  56 ++++++++++++++--------------
 views/admin/view-application.php |   5 ++-
 views/front/formTemplate.php     |  62 +++++++++++++++++++------------
 views/front/jobDetail.php        |  30 +++++++++++++--
 views/front/jobList.php          |  17 +++++++--
 views/front/jobSearch.php        |   2 +-
 10 files changed, 153 insertions(+), 72 deletions(-)
 create mode 100644 assets/click-here-to-print.jpg

diff --git a/assets/click-here-to-print.jpg b/assets/click-here-to-print.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..05ea0fa5a24ad217fedc7b573bc1a91d6cf99598
GIT binary patch
literal 4267
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
OVAB}GpSN3aKJg#Nf}K48

literal 0
HcmV?d00001

diff --git a/controllers/front.php b/controllers/front.php
index 30aea10..4a84ed8 100644
--- a/controllers/front.php
+++ b/controllers/front.php
@@ -337,20 +337,28 @@ class glm_employment_front
                 if (in_array($field['name'], array('fname', 'lname', 'mname'))) {
                     $this->$field['name'] = $form[$rowKey][$fieldKey]['value'];
                 }
-                if (   ($field['type'] == 'checkbox' || $field['type'] == 'radio')
-                    && isset($field['opts']) && !empty($field['opts'])
+                if (   ($field['type'] == 'radio') && isset($field['opts']) && !empty($field['opts'])
                 ) {
 
                     foreach ($field['opts'] as $opKey => $option) {
                         if (isset($_POST[$field['name']])) {
                             $form[$rowKey][$fieldKey]['opts'][$opKey]['checked'] = true;
-                            if ($field['type'] == 'checkbox') {
-                                $_POST[$option['name']] = $option['value'];
-                            }
-
                         }
                     }
                 }
+                if (   ($field['type'] == 'checkbox') && isset($field['opts']) && !empty($field['opts'])
+                ) {
+                    $checkboxOptions = array();
+                    foreach ($field['opts'] as $opKey => $option) {
+                        if (isset($_POST[$option['name']])) {
+                            $form[$rowKey][$fieldKey]['opts'][$opKey]['checked'] = true;
+                            $_POST[$option['name']][] = $option['value'];
+                            $checkboxOptions[] = $option['value'];
+                        }
+                    }
+                    $form[$rowKey][$fieldKey]['value'][] = implode(', ', $checkboxOptions);
+                    $checkboxOptions = array();
+                }
                 if (   isset($field['req'])
                     && $field['req'] == true
                     && $_POST[$field['name']] == ''
@@ -360,8 +368,7 @@ class glm_employment_front
                     ++$this->errorCount;
                 }
 
-                if (   isset($field['rule'])
-                    && $_POST[$field['name']] != ''
+                if (   isset($field['rule']) && $_POST[$field['name']] != ''
                 ) {
                     switch ($field['rule']) {
                     case 'email':
@@ -406,6 +413,14 @@ class glm_employment_front
         global $wpdb, $wp;
         $job    = get_post($job_id);
         $custom = get_post_custom($job->ID);
+        $depTax = wp_get_post_terms( $job->ID, GLM_EMP_TAX_DEPARTMENTS, 'name' );
+        foreach ($depTax as $depTerm) {
+            $deps[] = $depTerm->name;
+        }
+        $catTax = wp_get_post_terms( $job->ID, GLM_EMP_TAX_CATEGORIES, 'name' );
+        foreach ($catTax as $catTerm) {
+            $cats[] = $catTerm->name;
+        }
         $job->glm_jobs_startdate = $custom['glm_jobs_startdate'][0];
         $job->glm_jobs_enddate   = $custom['glm_jobs_enddate'][0];
         $job->glm_jobs_contact   = $custom['glm_jobs_contact'][0];
@@ -415,6 +430,8 @@ class glm_employment_front
         $job->glm_jobs_email     = $custom['glm_jobs_email'][0];
         $job->glm_jobs_comments  = $custom['glm_jobs_comments'][0];
         $job->glm_jobs_code      = $custom['glm_jobs_code'][0];
+        $job->glm_jobs_property  = $deps;
+        $job->glm_jobs_category  = $cats;
         $current_url             = esc_url(add_query_arg($wp->query_string, '', home_url($wp->request)));
         $applyOnlineHref         = $current_url
                 . ((strpos($current_url, '?')) ? '&' : '?')
@@ -443,6 +460,7 @@ class glm_employment_front
             ? filter_var($_REQUEST['glm_jobsdepartment'])
             : false;
         $args = array(
+            'posts_per_page' => -1,
             'post_type' => GLM_EMP_POST_TYPE,
             'meta_query' => array(
                 array(
@@ -481,7 +499,16 @@ class glm_employment_front
         $current_url = esc_url(add_query_arg($wp->query_string, '', home_url($wp->request)));
         $iterator = 1;
         foreach ($jobs as $job) {
+            $deps = $cats = array();
             $custom = get_post_custom($job->ID);
+            $depTax = wp_get_post_terms( $job->ID, GLM_EMP_TAX_DEPARTMENTS, 'name' );
+            foreach ($depTax as $depTerm) {
+                $deps[] = $depTerm->name;
+            }
+            $catTax = wp_get_post_terms( $job->ID, GLM_EMP_TAX_CATEGORIES, 'name' );
+            foreach ($catTax as $catTerm) {
+                $cats[] = $catTerm->name;
+            }
             $job->end                = false;
             $job->glm_jobs_startdate = $custom['glm_jobs_startdate'][0];
             $job->glm_jobs_enddate   = $custom['glm_jobs_enddate'][0];
@@ -492,6 +519,8 @@ class glm_employment_front
             $job->glm_jobs_email     = $custom['glm_jobs_email'][0];
             $job->glm_jobs_comments  = $custom['glm_jobs_comments'][0];
             $job->glm_jobs_code      = $custom['glm_jobs_code'][0];
+            $job->glm_jobs_property  = $deps;
+            $job->glm_jobs_category  = $cats;
             $job->href               = $current_url
                 . ((strpos($current_url, '?')) ? '&' : '?')
                 . "job=" . $job->ID;
diff --git a/css/admin-print-application.css b/css/admin-print-application.css
index 5dd923d..62bcdbb 100644
--- a/css/admin-print-application.css
+++ b/css/admin-print-application.css
@@ -22,8 +22,8 @@
     width: 91.66667%; }
 .large-12 {
     width: 100%; }
-#adminmenuback, #adminmenuwrap, #wpadminbar, #wpfooter {
-    display: none;
+#adminmenu, #adminmenuback, #adminmenuwrap, #wpadminbar, #wpfooter, .updated, #print-this-page {
+    display: none !important;
 }
 #appForm {
     width: 100%;
diff --git a/glm-employment.php b/glm-employment.php
index 8f4b1f9..a081020 100644
--- a/glm-employment.php
+++ b/glm-employment.php
@@ -17,7 +17,11 @@ define('GLM_EMP_VERSION', '0.0.1');
 define('GLM_EMP_VRS_OPTION_NAME', 'glm_jobs_db_version');
 define('GLM_EMP_POST_TYPE', 'glm_jobs');
 define('GLM_EMP_TAX_CATEGORIES', 'glm_jobscategory');
+define('GLM_EMP_CATEGORY_SINGLE', 'Category');
+define('GLM_EMP_CATEGORY_PLURAL', 'Categories');
 define('GLM_EMP_TAX_DEPARTMENTS', 'glm_jobsdepartment');
+define('GLM_EMP_DEPARTMENT_SINGLE', 'Department');
+define('GLM_EMP_DEPARTMENT_PLURAL', 'Departments');
 define('GLM_EMP_APPLICATION_TABLE', 'glm_jobs_application');
 define('GLM_EMP_FORM_TABLE', 'glm_jobs_app_form');
 $wp_upload_dir = wp_upload_dir();
diff --git a/models/job.php b/models/job.php
index 21eb477..8c1b71d 100644
--- a/models/job.php
+++ b/models/job.php
@@ -328,7 +328,7 @@ class glm_employment_job
             'menu_name'          => 'Jobs'
         );
         $args   = array(
-//            'label'           => __('Jobs'),
+            'label'           => __('Jobs'),
             'labels'          => $labels,
             'description'     => 'Stores Jobs and Job data',
             'public'          => true,
@@ -367,7 +367,7 @@ class glm_employment_job
     {
         global $post, $post_ID;
 
-        $messages['post'] = array(
+        $messages['glm_jobs'] = array(
             0  => '', // Unused. Messages start at index 1.
             1  => sprintf(__('Job updated. <a href="%s">View item</a>'),
                              esc_url(get_permalink($post_ID))),
@@ -404,28 +404,28 @@ class glm_employment_job
     public function createJobTaxonomy()
     {
         $labels = array(
-            'name'                       => _x('Categories',
+            'name'                       => _x(GLM_EMP_CATEGORY_PLURAL,
                                                'taxonomy general name'),
-            'singular_name'              => _x('Category',
+            'singular_name'              => _x(GLM_EMP_CATEGORY_SINGLE,
                                                'taxonomy singular name'),
-            'search_items'               => __('Search Categories'),
-            'popular_items'              => __('Popular Categories'),
-            'all_items'                  => __('All Categories'),
+            'search_items'               => __('Search' . GLM_EMP_CATEGORY_PLURAL),
+            'popular_items'              => __('Popular ' . GLM_EMP_CATEGORY_PLURAL),
+            'all_items'                  => __('All ' . GLM_EMP_CATEGORY_PLURAL),
             'parent_item'                => null,
             'parent_item_colon'          => null,
-            'edit_item'                  => __('Edit Category'),
-            'update_item'                => __('Update Category'),
-            'add_new_item'               => __('Add New Category'),
-            'new_item_name'              => __('New Category Name'),
-            'separate_items_with_commas' => __('Separate categories with commas'),
-            'add_or_remove_items'        => __('Add or remove categories'),
-            'choose_from_most_used'      => __('Choose from the most used categories'),
+            'edit_item'                  => __('Edit ' . GLM_EMP_CATEGORY_SINGLE),
+            'update_item'                => __('Update ' . GLM_EMP_CATEGORY_SINGLE),
+            'add_new_item'               => __('Add New ' . GLM_EMP_CATEGORY_SINGLE),
+            'new_item_name'              => __('New ' . GLM_EMP_CATEGORY_SINGLE . ' Name'),
+            'separate_items_with_commas' => __('Separate ' . strtolower( GLM_EMP_CATEGORY_PLURAL ) . ' with commas'),
+            'add_or_remove_items'        => __('Add or remove ' . strtolower( GLM_EMP_CATEGORY_PLURAL )),
+            'choose_from_most_used'      => __('Choose from the most used ' . strtolower( GLM_EMP_CATEGORY_PLURAL )),
         );
 
         register_taxonomy(
             GLM_EMP_TAX_CATEGORIES, GLM_EMP_POST_TYPE,
             array(
-            'label'             => __('Job Category'),
+        'label'             => __('Job ' . GLM_EMP_CATEGORY_SINGLE),
             'labels'            => $labels,
             'hierarchical'      => true,
             'show_ui'           => true,
@@ -436,28 +436,28 @@ class glm_employment_job
         ));
 
         $labels = array(
-            'name'                       => _x('Departments',
+            'name'                       => _x(GLM_EMP_DEPARTMENT_PLURAL,
                                                'taxonomy general name'),
-            'singular_name'              => _x('Department',
+            'singular_name'              => _x(GLM_EMP_DEPARTMENT_SINGLE,
                                                'taxonomy singular name'),
-            'search_items'               => __('Search Departments'),
-            'popular_items'              => __('Popular Departments'),
-            'all_items'                  => __('All Departments'),
+            'search_items'               => __('Search ' . GLM_EMP_DEPARTMENT_PLURAL),
+            'popular_items'              => __('Popular ' . GLM_EMP_DEPARTMENT_PLURAL),
+            'all_items'                  => __('All ' . GLM_EMP_DEPARTMENT_PLURAL),
             'parent_item'                => null,
             'parent_item_colon'          => null,
-            'edit_item'                  => __('Edit Department'),
-            'update_item'                => __('Update Department'),
-            'add_new_item'               => __('Add New Department'),
-            'new_item_name'              => __('New Department Name'),
-            'separate_items_with_commas' => __('Separate departments with commas'),
-            'add_or_remove_items'        => __('Add or remove departments'),
-            'choose_from_most_used'      => __('Choose from the most used departments'),
+            'edit_item'                  => __('Edit ' . GLM_EMP_DEPARTMENT_SINGLE),
+            'update_item'                => __('Update ' . GLM_EMP_DEPARTMENT_SINGLE),
+            'add_new_item'               => __('Add New ' . GLM_EMP_DEPARTMENT_SINGLE),
+            'new_item_name'              => __('New ' . GLM_EMP_DEPARTMENT_SINGLE . ' Name'),
+            'separate_items_with_commas' => __('Separate ' . strtolower( GLM_EMP_DEPARTMENT_PLURAL ) . ' with commas'),
+            'add_or_remove_items'        => __('Add or remove ' . strtolower( GLM_EMP_DEPARTMENT_PLURAL )),
+            'choose_from_most_used'      => __('Choose from the most used ' . strtolower( GLM_EMP_DEPARTMENT_PLURAL )),
         );
 
         register_taxonomy(
             GLM_EMP_TAX_DEPARTMENTS, GLM_EMP_POST_TYPE,
             array(
-            'label'        => __('Job Department'),
+            'label'        => __('Job ' . GLM_EMP_DEPARTMENT_SINGLE),
             'labels'       => $labels,
             'hierarchical' => true,
             'show_ui'      => true,
diff --git a/views/admin/view-application.php b/views/admin/view-application.php
index 8095610..8d8337f 100644
--- a/views/admin/view-application.php
+++ b/views/admin/view-application.php
@@ -1,5 +1,6 @@
-<link rel="stylesheet" href="../wp-content/plugins/glm-employment/css/admin-view-application.css" type="text/css"/>
-<link rel="stylesheet" href="../wp-content/plugins/glm-employment/css/admin-print-application.css" type="text/css" media="print" />
+<link rel="stylesheet" href="<?php echo plugins_url( basename( $this->pluginDirName ) ); ?>/css/admin-view-application.css" type="text/css"/>
+<link rel="stylesheet" href="<?php echo plugins_url( basename( $this->pluginDirName ) ); ?>/css/admin-print-application.css" type="text/css" media="print" />
+<a href="javascript:window.print();" id="print-this-page"><img src="<?php echo plugins_url( basename( $this->pluginDirName ) ); ?>/assets/click-here-to-print.jpg"></a>
 <div id="appForm">
     <?php include $viewPath . 'form_1.php';?>
 </div>
diff --git a/views/front/formTemplate.php b/views/front/formTemplate.php
index b3c5728..91f8c2a 100644
--- a/views/front/formTemplate.php
+++ b/views/front/formTemplate.php
@@ -1,22 +1,11 @@
 <style>
-    div.static {
-        text-align:left;
-        padding-top: 5px;
-    }
-    .row.content ul.glm-emp-forms-ul {
-        columns: 1;
-        -moz-columns: 1;
-        -webkit-columns: 1;
-        margin-left: auto;
-        margin-right: auto;
-        padding-left: 20px;
-    }
-    input[type="checkbox"] {
-        margin-top: 10px;
-    }
+    div.static {text-align:left;padding-top: 5px;}
+    .row.content ul.glm-emp-forms-ul {columns: 1;-moz-columns: 1;-webkit-columns: 1;margin-left:auto;margin-right:auto;padding-left: 20px;}
+    input[type="checkbox"] {margin-top: 10px; }
     .row h4 {padding-top: 0;}
+    #glm-job-form-wrap input[type=radio]+label {margin-left:0;}
 </style>
-<div class="row">
+<div class="row" id="glm-job-form-wrap">
     <div class="small-12 columns">
         <h1><?php if(isset($formTitle)) {echo $formTitle;}?></h1>
         <form method="post" action="<?php echo $formAction;?>" enctype="multipart/form-data">
@@ -28,9 +17,15 @@
             <?php if (isset($jobId) && $jobId):?>
             <input type="hidden" name="job" value="<?php echo $jobId;?>">
             <?php endif;?>
-            <?php foreach($form as $row):?>
+            <?php $totalFormRows = count( $form ); $fRowCounter = 0;?>
+            <?php foreach($form as $row): // $form foreach ?>
+            <?php ++$fRowCounter;?>
             <?php if (isset($row['type']) && $row['type'] == 'header') :?>
-                <h3><?php echo $row['label'];?></h3>
+                    <?php if ( $fRowCounter != 1 ) : ?>
+                    </div>
+                    <?php endif;?>
+                    <h3><?php echo $row['label'];?></h3>
+                    <div class="panel radius">
                 <?php if (isset($row['subheader']) && $row['subheader']) {?>
                     <h4 class="subheader"><?php echo $row['subheader'];?></h4>
                 <?php }?>
@@ -40,9 +35,18 @@
             <?php else:?>
                 <div class="row<?php echo (isset($row[0]['rcoll']) && $row[0]['rcoll'])?' collapse':'';?>">
                     <?php foreach($row as $field) :?>
-                    <div class="small-<?php echo $field['grid'];?> columns">
+                    <div class="small-12 medium-<?php echo $field['grid'];?> columns">
                         <label<?php if (isset($field['req']) && $field['req']):?> class="error"<?php endif;?>>
-                            <?php if(isset($field['label'])) { echo $field['label'];}?>
+                            <?php if ( isset( $field['label'] ) ) {
+                                    if ( $field['type'] == 'static' ) {
+                                        echo '<span class="show-for-medium-up">' . $field['label'] . '</span>';
+                                    } else {
+                                        echo $field['label'];
+                                    }
+                                    if ( $field['label'] == '' && $field ['hdr'] ) {
+                                        echo '<span class="show-for-small-only">' . $field['hdr']['label'] . '</span>';
+                                    }
+                                }?>
                         </label>
                             <?php switch($field['type']) :
                             case 'text':?>
@@ -115,7 +119,9 @@
                                 <?php endforeach;?>
                             <?php break;?>
                             <?php case 'checkbox':?>
-                                <?php foreach($field['opts'] as $option) :?>
+                                <?php $opCounter = 1; $totalOpts = count($field['opts']);?>
+                                <?php foreach($field['opts'] as $option) :?><label for="<?php echo $option['name'];?>"
+                                    class="small-12 medium-6 large-4 columns<?php if ($opCounter == $totalOpts) {echo ' end';}?>">
                                     <input
                                         <?php if (isset($field['error']) && $field['error']){echo 'class="error"';}?>
                                         <?php if (isset($field['req']) && $field['req']){echo 'required';}?>
@@ -129,7 +135,8 @@
                                         <?php if (isset($option['checked']) && $option['checked']) {
                                             echo 'checked';
                                         }?> />
-                                    <label for="<?php echo $option['name'];?>"><?php echo $option['label'];?></label>
+                                    <?php echo $option['label'];?></label>
+                                    <?php ++$opCounter;?>
                                 <?php endforeach;?>
                             <?php break;?>
                             <?php endswitch;?>
@@ -140,10 +147,17 @@
                     <?php endforeach;?>
                 </div>
             <?php endif;?>
-            <?php endforeach;?>
+            <?php if ( $fRowCounter == $totalFormRows ) { ?>
+                </div>
+            <?php } ?>
+            <?php endforeach; // $form endforeach ?>
             <div class="row">
-                <div>
+                <div class="small-12 small-text-center columns">
+                    <?php if ( $endOfForms == true ) : ?>
+                    <input type="submit" class="button" value="Submit">
+                    <?php else : ?>
                     <input type="submit" class="button" value="Continue">
+                    <?php endif;?>
                 </div>
             </div>
         </form>
diff --git a/views/front/jobDetail.php b/views/front/jobDetail.php
index 752537c..09934f0 100644
--- a/views/front/jobDetail.php
+++ b/views/front/jobDetail.php
@@ -1,9 +1,32 @@
-<a href="<?php echo get_permalink();?>">Back To Search</a>
 <div class="small-12 columns">
-    <h2><a href="<?php echo $job->href; ?>"><?php echo $job->post_title; ?></a></h2>
+    <a href="<?php echo get_permalink();?>">Back To Employment Search</a>
+    <br>
+    <br>
+</div>
+<div class="small-12 columns">
+    <h2><?php echo $job->post_title; ?></h2>
+    <?php if ($job->glm_jobs_property) : ?>
+    <div><strong>
+    <?php echo (count( $job->glm_jobs_property ) > 1 ) ? GLM_EMP_DEPARTMENT_PLURAL . ':' : GLM_EMP_DEPARTMENT_SINGLE . ':' ?> </strong>
+    <?php echo implode(', ', $job->glm_jobs_property);?>
+    </div>
+    <?php endif; ?>
+    <?php if ($job->glm_jobs_category) : ?>
+    <div><strong>
+    <?php echo (count( $job->glm_jobs_category ) > 1 ) ? GLM_EMP_CATEGORY_PLURAL . ':' : GLM_EMP_CATEGORY_SINGLE . ':' ?> </strong>
+    <?php echo implode(', ', $job->glm_jobs_category);?>
+    </div>
+    <?php endif; ?>
+    <?php if ($job->glm_jobs_status):?>
     <div><strong>Status: </strong><?php echo $job->glm_jobs_status; ?></div>
+    <?php endif;?>
+    <?php if ($job->glm_jobs_pay_grade):?>
     <div><strong>Pay Grade: </strong><?php echo $job->glm_jobs_pay_grade; ?></div>
+    <?php endif;?>
+    <?php if ($job->glm_jobs_email):?>
     <div><strong>Shift: </strong><?php echo $job->glm_jobs_shift; ?></div>
+    <?php endif;?>
+    <?php if ($job->glm_jobs_contact):?>
     <div><strong>Contact: </strong>
         <?php if ($job->glm_jobs_email):?>
         <a href="mailto: <?php echo $job->glm_jobs_email;?>">
@@ -13,6 +36,7 @@
         </a>
         <?php endif;?>
     </div>
+    <?php endif;?>
     <div><?php echo apply_filters('the_content', $job->post_content);?></div>
     <a href="<?php echo $applyOnlineHref;?>">Apply Online</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/front/jobList.php b/views/front/jobList.php
index 1cd1cc4..02774e2 100644
--- a/views/front/jobList.php
+++ b/views/front/jobList.php
@@ -1,11 +1,20 @@
 <div>
-    <h1>List Jobs</h1>
     <div class="row">
         <?php if ($jobs): foreach($jobs as $job) :?>
-        <div class="small-12 medium-6 columns<?php if ($job->end){ echo ' end';}?>">
+        <div class="small-12 columns<?php if ($job->end){ echo ' end';}?>">
             <h2><a href="<?php echo $job->href;?>"><?php echo $job->post_title;?></a></h2>
-            <div><strong>Status: </strong><?php echo $job->glm_jobs_status;?></div>
-            <div><a href="<?php echo $job->href;?>">Full Job Description</a></div>
+            <?php if ($job->glm_jobs_property) : ?>
+            <div>
+            <?php echo (count( $job->glm_jobs_property ) > 1 ) ? GLM_EMP_DEPARTMENT_PLURAL . ':' : GLM_EMP_DEPARTMENT_SINGLE . ':' ?>
+            <?php echo implode(', ', $job->glm_jobs_property);?>
+            </div>
+            <?php endif; ?>
+            <?php if ($job->glm_jobs_category) : ?>
+            <div>
+            <?php echo (count( $job->glm_jobs_category ) > 1 ) ? GLM_EMP_CATEGORY_PLURAL . ':' : GLM_EMP_CATEGORY_SINGLE . ':' ?>
+            <?php echo implode(', ', $job->glm_jobs_category);?>
+            </div>
+            <?php endif; ?>
         </div>
         <?php endforeach; endif;?>
     </div>
diff --git a/views/front/jobSearch.php b/views/front/jobSearch.php
index 7dbaa99..b12a496 100644
--- a/views/front/jobSearch.php
+++ b/views/front/jobSearch.php
@@ -14,4 +14,4 @@
             <input class="button" type="submit" value="Search">
         </div>
     </div>
-</form>
\ No newline at end of file
+</form>
-- 
2.17.1