1 files changed, 20 insertions, 6 deletions

diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js
index 887c078..423effd 100644
--- a/src/components/mao-tutoring.js
+++ b/src/components/mao-tutoring.js
@@ -220,6 +220,8 @@ class MaoTutoring extends connect(store)(PageViewElement) {
 
               <paper-input id="traineeField" label="Trainee's Name" type="text"></paper-input>
 
+              <paper-input id="subjectField" label="Math Subject" type="text"></paper-input>
+
               <vaadin-date-picker id="dateField" placeholder="Choose Date">
               </vaadin-date-picker>
 
@@ -295,18 +297,20 @@ class MaoTutoring extends connect(store)(PageViewElement) {
     signedIn:           Boolean,
     hours:              Number,
     requestedHours:     Number,
+    isUploaded:         Boolean,
+    pictureName:        String,
 
-    submitFieldsOpened: Boolean,
-    isUploaded:         Boolean
+    submitFieldsOpened: Boolean
   }}
 
   _stateChanged(state) {
     this.hours          = state.firebaseFirestore .hours;
     this.requestedHours = state.firebaseFirestore .requestedHours;
     this.signedIn       = state.firebaseAuth      .signedIn;
+    this.isUploaded     = state.firebaseStorage   .uploaded;
+    this.pictureName    = state.firebaseStorage   .pictureName;
 
     this.sumbitFieldsOpened = false;
-    this.isUploaded         = false;
   }
 
   toggleSubmitFields() {
@@ -317,12 +321,16 @@ class MaoTutoring extends connect(store)(PageViewElement) {
     if(this.shadowRoot && !this.isUploaded) {
       var timeElement     = this.shadowRoot.getElementById('timeField');
       var traineeElement  = this.shadowRoot.getElementById('traineeField');
+      var subjectElement  = this.shadowRoot.getElementById('subjectField');
       var locationElement = this.shadowRoot.getElementById('locationField');
       var dateElement     = this.shadowRoot.getElementById('dateField');
+      var uploaderElement = this.shadowRoot.getElementById('uploader');
+      var fileElement     = this.shadowRoot.getElementById('pictureField');
 
       if( timeElement     .value.trim() === "" ||
           locationElement .value.trim() === "" ||
           traineeElement  .value.trim() === "" ||
+          subjectElement  .value.trim() === "" ||
           dateElement     .value        === "") {
             alert("Please fill out all fields when making hours request.");
           } else {
@@ -331,24 +339,30 @@ class MaoTutoring extends connect(store)(PageViewElement) {
                                   /60;
               const location    = locationElement .value;
               const traineeName = traineeElement  .value;
+              const subject     = subjectElement  .value;
               const date        = dateElement     .value;
 
-              store.dispatch(requestHours(timeHours, traineeName, location, date));
+              store.dispatch(requestHours(timeHours, traineeName, subject, location, date, this.pictureName));
 
               timeElement     .value  = "";
               traineeElement  .value  = "";
+              subjectElement  .value  = "";
               locationElement .value  = "";
               dateElement     .value  = "";
+              uploaderElement .value  =  0;
+              fileElement     .value  = "";
             }
         }
     } else {
-      alert("You must upload an image to submit hours.")
+      alert("You must upload an image with your trainee to submit hours.")
     }
   }
 
   uploadFile() {
     if(this.shadowRoot) {
-      var uploader  = this.shadowRoot.getElementById('uploader');
+      var uploader    = this.shadowRoot.getElementById('uploader');
+      uploader.value  = 0;
+
       var file      = this.shadowRoot.getElementById('pictureField').inputElement.inputElement.files[0];
 
       store.dispatch(uploadPicture(file, uploader));