aboutsummaryrefslogtreecommitdiffstats
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/models/report.js2
-rw-r--r--www/js/views/submit.js27
2 files changed, 27 insertions, 2 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, _, $);