submit report by signing in with a password

3 files changed, 35 insertions, 4 deletions

diff --git a/www/js/models/report.js b/www/js/models/report.js
index 4334ba4..e7198a3 100644
--- a/www/js/models/report.js
+++ b/www/js/models/report.js
@@ -68,7 +68,7 @@
                     phone: model.get('user').get('phone')
                 };
 
-                if ( this.submit_clicked == 'submit_sign_in' ) {
+                if ( model.get('submit_clicked') == 'submit_sign_in' ) {
                     params.submit_sign_in = 1;
                     params.password_sign_in = model.get('user').get('password');
                 } else {
diff --git a/www/js/views/submit.js b/www/js/views/submit.js
index a19ead6..3f9b181 100644
--- a/www/js/views/submit.js
+++ b/www/js/views/submit.js
@@ -185,9 +185,34 @@
                 'pageshow': 'afterDisplay',
                 'click .ui-btn-left': 'onClickButtonPrev',
                 'click #report': 'onClickSubmit',
+                'click #confirm_name': 'onClickSubmit'
             },
 
-            validate: function() { return 1; }
+            initialize: function() {
+                this.model.on('sync', this.onReportSync, this );
+                this.model.on('error', this.onReportError, this );
+            },
+
+            validate: function() { return 1; },
+
+            beforeSubmit: function() {
+                if ( $('#form_name').val() ) {
+                    this.model.set('submit_clicked', '');
+                    FMS.currentUser.set('name', $('#form_name').val());
+                } else {
+                    this.model.set('submit_clicked', 'submit_sign_in');
+                    FMS.currentUser.set('password', $('#form_password').val());
+                }
+            },
+
+            onReportError: function(model, err, options) {
+                if ( err.check_name ) {
+                    $('#form_name').val(err.check_name);
+                    $('#password_row').hide();
+                    $('#check_name').show();
+                }
+            }
+
         })
     });
 })(FMS, Backbone, _, $);
diff --git a/www/templates/en/submit_password.html b/www/templates/en/submit_password.html
index 7c7a3b2..88893c8 100644
--- a/www/templates/en/submit_password.html
+++ b/www/templates/en/submit_password.html
@@ -3,6 +3,12 @@
 </div>
 
 <div class="container" data-role="content" data-enhance="false">
-    <input type="password" value="" name="password" id="form_password" placeholder="Your password" required>
-    <input class="green-btn" type="button" id="submit_sign_in" name="submit_sign_in" value="Report">
+    <div id="password_row">
+        <input type="password" value="" name="password" id="form_password" placeholder="Your password" required>
+        <input class="green-btn" type="button" id="report" name="report" value="Report">
+    </div>
+    <div id="check_name" class="nodisplay">
+        <input type="text" value="" id="form_name" name="name">
+        <input class="green-btn" type="button" id="report" name="report" value="Confirm name">
+    </div>
 </div>