Sb email qc component

deploy/config.sh

@@ -13,8 +13,12 @@ fi
 
 # Main version number we are tagging the app with. Always update
 # this when you cut a new version of the app!
+<<<<<<< HEAD
+APP_VERSION=v1.0.0.${BUILD_NUM}
+=======
 APP_SEMVER=1.0.0
 APP_VERSION=v${APP_SEMVER}.${BUILD_NUM}
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
 
 # This is used anywhere a name is needed for the app
 APP_SLUG=ucdlib-travel

deploy/db-entrypoint/001-tables.sql

@@ -105,7 +105,10 @@ CREATE TABLE approval_request (
     is_current BOOLEAN NOT NULL DEFAULT TRUE,
     approval_status VARCHAR(100) NOT NULL,
     reimbursement_status VARCHAR(100) NOT NULL,
+<<<<<<< HEAD
+=======
     expect_more_reimbursement BOOLEAN NOT NULL DEFAULT FALSE,
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
     employee_kerberos VARCHAR(100) REFERENCES employee(kerberos),
     label VARCHAR(100),
     organization VARCHAR(100),
@@ -247,7 +250,10 @@ COMMENT ON COLUMN reimbursement_request_expense.details IS 'Additional details a
 CREATE TABLE reimbursement_request_receipt (
     reimbursement_request_receipt_id SERIAL PRIMARY KEY,
     reimbursement_request_id INTEGER REFERENCES reimbursement_request(reimbursement_request_id),
+<<<<<<< HEAD
+=======
     reimbursement_request_expense_id INTEGER REFERENCES reimbursement_request_expense(reimbursement_request_expense_id),
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
     file_path TEXT NOT NULL,
     file_type VARCHAR(100) NOT NULL,
     label VARCHAR(200),

deploy/db-entrypoint/004-settings.sql

@@ -8,7 +8,11 @@ INSERT INTO "settings" ("key", "value", "label", "description", "default_value",
 VALUES ('approval_request_form_location_in-state', '', 'Location: In-state desciption', 'Description below the in-state option of the location radio on the approval request form', NULL, '0', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '1');
 
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
+<<<<<<< HEAD
+VALUES ('approval_request_form_location_out-of-state', '', 'Location: Out of State Description', 'Description below the out-of-state option of the location radio on the approval request form', 'IMPORTANT: All out-of-state trips must be registered using the <a href=''https://ehs.ucop.edu/away/''>UC Away form</a>.', '1', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '1');
+=======
 VALUES ('approval_request_form_location_out-of-state', '', 'Location: Out of State Description', 'Description below the out-of-state option of the location radio on the approval request form', '', '0', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '1');
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
 
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('approval_request_form_location_virtual', '', 'Location: Virtual desciption', 'Description below the virtual option of the location radio on the approval request form', NULL, '0', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '1');
@@ -34,6 +38,8 @@ VALUES ('allocation_summary_description', '', 'Allocation Summary Description',
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('approval_request_form_release_time', '', 'Release Time - Description', 'Displays below release time input on approval request form', NULL, '0', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '0');
 
+<<<<<<< HEAD
+=======
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('approval_request_more_reimbursement_description', '', 'More Reimbursement Description', 'Shows in reimbursement section of approval request when all reimbursements have been processed, but employee has indicated that more requests are forthcoming', 'Even though all reimbursement requests have been fully processed, the overall reimbursement status for this trip/professional development opportunity is still "partially processed" because the employee indicated that more reimbursement requests are forthcoming.', '1', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '1');
 
@@ -48,6 +54,7 @@ VALUES ('approval_request_form_business_purpose', '', 'Business Purpose Descript
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('approval_request_form_location_description', '', 'Location: Overall Description', 'Displays below location section header on new approval request form', 'IMPORTANT: All out-of-state trips must be registered using the <a href=''https://ehs.ucop.edu/away/''>UC Away form</a>.', '1', NULL, '10', 'textarea', '{approval-requests,admin-settings}', '1');
 
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
 -- admin line items page
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('admin_line_items_description', '', 'Admin - Line Items Description', 'Displays on top of line item admin settings page', 'Requesters will be able to select and assign monetary values to the following line items when submitting an approval form', '1', NULL, '100', 'textarea', '{admin-line-items,admin-settings}', '1');
@@ -69,8 +76,11 @@ INSERT INTO "settings" ("key", "value", "label", "description", "default_value",
 VALUES ('admin_allocations_general_settings_page_description', '', 'Admin - Employee Allocations General Settings Page Description', NULL, 'Manage form field help text and other general settings.', '1', NULL, '100', 'textarea', '{admin-page,admin-settings}', '0');
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('admin_allocations_line_items_page_description', '', 'Admin - Employee Allocations Line Items Page Description', NULL, 'Manage expenditure line item options when submitting an approval request.', '1', NULL, '100', 'textarea', '{admin-page,admin-settings}', '0');
+<<<<<<< HEAD
+=======
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('admin_approval_requests_page_description', '', 'Admin - Approval Requests Page Description', NULL, 'View and manage all approval requests.', '1', NULL, '100', 'textarea', '{admin-page,admin-settings}', '0');
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
 
 -- admin email settings
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html") VALUES
@@ -223,12 +233,15 @@ INSERT INTO "settings" ("key", "value", "label", "description", "default_value",
 VALUES ('reimbursement_form_exceed_message', '', 'Exceeded Approved Expenses Message', 'Displayed on reimbursement request form if expenses exceed approved dollar amount.', 'You have exceeded the approved dollar amount for this travel, training, or professional development event. <br /> <br />Please verify with initial approvers before submitting this request.', '1', NULL, '200', 'textarea', '{admin-settings,reimbursement-requests}', '1');
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('reimbursement_no_fund_transactions_message', '', 'No Fund Transactions Message', 'Displays in "Reimbursement Status" section of reimbursement request if there has been nothing entered into Aggie Expense.', 'No reimbursements have been entered into Aggie Expense yet. Please check back later.', '1', NULL, '200', 'textarea', '{admin-settings,reimbursement-requests}', '1');
+<<<<<<< HEAD
+=======
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('reimbursement_form_receipts', '', 'Reimbursement Request Receipts Description', 'Displays above receipt repeater field on new reimbursement request page', NULL, '0', NULL, '30', 'textarea', '{reimbursement-requests,admin-settings}', '0');
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")
 VALUES ('reimbursement_form_label_options', '', 'Reimbursement Request Label Options', 'Populates "Label" select options on new reimbursement request.', 'Post-Trip Expenses
 Pre-Trip Expenses
 Other Expenses', '1', NULL, '30', 'textarea', '{reimbursement-requests,admin-settings}', '0');
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
 
 -- reports
 INSERT INTO "settings" ("key", "value", "label", "description", "default_value", "use_default_value", "keywords", "settings_page_order", "input_type", "categories", "can_be_html")

src/api/admin/notification.js

@@ -47,6 +47,7 @@ export default (api) => {
     const sender = payload.token.token.email;
     const emailContent = payload.emailContent;
 
+
     if ( !emailContent.subject || !emailContent.text ) {
       return res.status(400).json({error: true, message: 'Error with payload section emailContent. Email Subject or Email Text can not be empty'});
     }

src/client/js/app-main.tpl.js

@@ -56,9 +56,13 @@ return html`
     <app-page-admin-settings id='admin-settings'></app-page-admin-settings>
     <app-page-admin-allocations id='admin-allocations'></app-page-admin-allocations>
     <app-page-admin-allocations-new id='admin-allocations-new'></app-page-admin-allocations-new>
+<<<<<<< HEAD
+    <app-page-admin-line-items id='admin-line-items'></app-page-admin-line-items>
+=======
     <app-page-admin-approval-requests id='admin-approval-requests'></app-page-admin-approval-requests>
     <app-page-admin-line-items id='admin-line-items'></app-page-admin-line-items>
     <app-page-admin-email-settings id='admin-email-settings'></app-page-admin-email-settings>
+>>>>>>> e08265d6bde15cb1c212bc80a0d6db0fec292361
     <app-page-admin-reimbursement id='admin-reimbursement'></app-page-admin-reimbursement>
     <app-page-approver id='approver'></app-page-approver>
     <app-page-reimbursement id='reimbursement'></app-page-reimbursement>

src/client/js/components/app-questions-or-comments.js

@@ -0,0 +1,109 @@
+import { LitElement } from 'lit';
+import * as Templates from "./app-questions-or-comments.tpl.js";
+import { MainDomElement } from "@ucd-lib/theme-elements/utils/mixins/main-dom-element.js";
+import { createRef } from 'lit/directives/ref.js';
+import { LitCorkUtils, Mixin } from "@ucd-lib/cork-app-utils";
+
+/**
+ * @class AppQuestionsOrComments
+ * @description Component that either
+ * 1. Records a comment from the user
+ * 2. Records a question from the user
+ * @property {Number} approvalRequestId - Approval Request ID 
+ * @property {Number} reimbursementRequestId - Reimbursement ID
+ */
+export default class AppQuestionsOrComments extends Mixin(LitElement)
+.with(LitCorkUtils, MainDomElement) {
+
+  static get properties() {
+    return {
+      approvalRequestId: {type: Number, attribute: 'approval-request-id'},
+      reimbursementRequestId: {type: Number, attribute: 'reimbursement-request-id'},
+      modalTitle: {type: String},
+      modalContent: {type: String},
+      data: {type: Object},
+      comments: {type:String},
+      page:{type:String},
+    }
+  }
+
+  constructor() {
+    super();
+
+    this.render = Templates.render.bind(this);
+
+    this.page = "";
+    this.data = {};
+    this.subject = '';
+    this.comments = '';
+    this.actions = [
+          {text: 'Submit', value: 'questions-comments-item', color: 'quad'},
+          {text: 'Cancel', value: 'cancel', invert: true, color: 'primary'}
+        ];
+    this.settingsCategory = 'admin-email-settings'
+    this.dialogRef = createRef();
+
+    this._injectModel('AppStateModel', 'NotificationModel', 'ApprovalRequestModel', 'AuthModel', 'SettingsModel');
+  }
+
+  /**
+   * @description Bound to modal button(s) click event
+   * Will emit a AppStateModel event with the action value and data of qc
+   */
+  _onModalClick(){
+    this.dialogRef.value.showModal();
+  }
+
+  /**
+   * @description Bound to dialog button(s) click event
+   * Will emit a dialog-action AppStateModel event with the action value and data
+   * @param {String} action - The action value to emit
+   */
+   async _onButtonClick(action){
+    this.dialogRef.value.close();
+
+    if ( action !== 'questions-comments-item' ) return;
+
+    let url = window.location.pathname;
+
+    this.data = {
+        "emailContent": {
+          subject: this.subject,
+          text: this.comments
+        }, // email content 
+        "url": url, // url
+        "requests": {
+          approvalRequestId: this.approvalRequestId || null,
+          reimbursementRequestId: this.reimbursementRequestId || null,
+        }, // requests could be replaced with id
+        notificationType: 'questions-comments' // notification type
+    }
+
+    await this.NotificationModel.createNotificationComments(this.data);
+   }
+
+  /**
+   * @description bound to NotificationModel notification-comments event
+   * @param {Object} e - cork-app-utils event
+   * @returns
+   */
+     _onNotificationComments(e) {
+      let message, type;
+      if ( e.state !== 'loaded' ) return;
+
+      if(e.payload){
+        message = 'Successfully Created a Help Notification Comment'; 
+        type= 'success';
+      } else {
+        message = 'Error When Creating a Help Notification Comment'; 
+        type= 'error';
+      }
+
+      this.AppStateModel.showToast({message: message, type: type}); 
+
+
+    }
+
+}
+
+customElements.define('app-questions-or-comments', AppQuestionsOrComments);

src/client/js/components/app-questions-or-comments.tpl.js

@@ -0,0 +1,45 @@
+import { html } from 'lit';
+import { ref } from 'lit/directives/ref.js';
+
+
+export function render() { 
+    return html`
+    <a @click=${e => this._onModalClick(e)} class="focal-link category-brand--delta u-space-mb">
+          <div class="focal-link__figure focal-link__icon">
+            <i class="fa fa-question fa-2x"></i>
+          </div>
+          <div class="focal-link__body">
+            <h2 class='heading--highlight'>Question and Comments</h2>
+          </div>
+    </a>
+
+    <dialog ${ref(this.dialogRef)}>
+        <div>
+        <h2 class='heading--highlight'>Question and Comments</h2>
+        </div>
+        <div>
+            <input class='subject' placeholder="Add Subject Line..." .value=${this.subject} @input=${e => this.subject = e.target.value}>
+        </div>
+        <br />
+
+        <div>
+            <textarea class='comments' rows=10 cols=75 placeholder="Ask us anything...." .value=${this.comments} @input=${e => this.comments = e.target.value}></textarea>
+        </div>
+        <div class='alignable-promo__buttons flex flex--justify-center flex--wrap u-space-mt--large'>
+
+        ${this.actions.map(action => html`
+            <div class=${action.color ? 'category-brand--' + action.color : ''}>
+            <button 
+                @click=${e => this._onButtonClick(action.value)} 
+                class='btn btn--${action.invert ? 'invert' : 'primary'}'>${action.text}
+            </button>
+            </div>
+        `)}
+        </div>
+    </dialog>
+
+
+`;}
+
+
+

src/client/js/pages/app-page-home.js

@@ -9,6 +9,7 @@ import promiseUtils from '../../../lib/utils/promiseUtils.js';
 import applicationOptions from '../../../lib/utils/applicationOptions.js';
 import typeTransform from "../../../lib/utils/typeTransform.js";
 import urlUtils from '../../../lib/utils/urlUtils.js';
+import '../components/app-questions-or-comments.js'
 
 /**
  * @description Element for displaying the home page

src/client/js/pages/app-page-home.tpl.js

@@ -5,6 +5,7 @@ import '@ucd-lib/theme-elements/brand/ucd-theme-pagination/ucd-theme-pagination.
 
 export function render() {
 return html`
+  <app-questions-or-comments></app-questions-or-comments>
   <div class='l-gutter watercolor-bg--blue'>
     <div class="l-shrink u-space-py--large">
       <h2 class='heading--center-underline u-space-mb--large'>Your Active Requests</h2>

src/client/scss/components/app-questions-or-comments.scss

@@ -0,0 +1,16 @@
+app-questions-or-comments {
+  dialog::backdrop {
+    background-color: black;
+    opacity: 0.5;
+  }
+  dialog {
+    border: none;
+    padding: 2rem;
+  }
+  .alignable-promo__buttons {
+    display: flex;
+    align-items: center;
+    margin-top: 1rem;
+    flex-wrap: wrap;
+  }
+}

src/lib/cork/models/NotificationModel.js

@@ -43,7 +43,9 @@ class NotificationModel extends BaseModel {
       try {
         await this.service.createNotificationComments(payload, timestamp);
       } catch(e) {}
+
       const state = this.store.data.notificationComments[timestamp];
+
       if ( state && state.state === 'loaded' ) {
         this.store.data.notificationComments = {};
       }

src/lib/db-models/emailController.js

@@ -28,7 +28,7 @@ class Email {
 
     let emailSent;
     let details = {};
-    body = body + `\n${serverConfig.appRoot}/${url}`
+    body = body + `\n${serverConfig.appRoot}${url}`
 
     const from = sender;
     const to = await settings._getEmail(); // This is getting the email to send help too currently [email protected]

src/lib/db-models/employee.js

@@ -270,7 +270,6 @@ class Employee {
     // return records
     return returnSingle ? {res: recordsById[ids[0]]} : {res: ids.map(id => recordsById[id]).filter(record => record)};
   }
-
 }
 
 export default new Employee();