Prettier formatting.

This commit is contained in:
neviyn 2018-10-10 10:24:02 +01:00
parent 9925a900c6
commit 586fa70104
9 changed files with 426 additions and 419 deletions

View File

@ -34,8 +34,9 @@
text-align: center;
color: #2c3e50;
}
.fade-enter-active, .fade-leave-active {
transition: opacity .5s;
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.5s;
}
.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0;

View File

@ -23,13 +23,12 @@
</template>
<script>
import 'vue-awesome/icons/database'
import 'vue-awesome/icons/ban'
import "vue-awesome/icons/database";
import "vue-awesome/icons/ban";
export default {
name: "DatabaseUnavailable"
}
};
</script>
<style scoped>
</style>

View File

@ -26,9 +26,8 @@
<script>
export default {
name: "Home"
}
};
</script>
<style scoped>
</style>

View File

@ -36,8 +36,7 @@
mounted() {
Vue.axios
.get("/site")
.then(response => {
})
.then(response => {})
.catch(error => {
if (error.response.status === 404) {
this.$router.push("/dberror");
@ -66,7 +65,7 @@
};
if (form.checkValidity()) {
Vue.axios
.post("/site", {'name': this.siteName}, axiosConfig)
.post("/site", { name: this.siteName }, axiosConfig)
.then(response => {
this.alertVariant = "success";
this.alertText = "Successfully added " + response.data.text;

View File

@ -70,10 +70,14 @@ export default {
};
if (form.checkValidity()) {
Vue.axios
.post("/tutor", {
'siteId': this.siteSelection,
'name': this.tutorName
}, axiosConfig)
.post(
"/tutor",
{
siteId: this.siteSelection,
name: this.tutorName
},
axiosConfig
)
.then(response => {
this.alertVariant = "success";
this.alertText = "Successfully added " + response.data.text;

View File

@ -210,13 +210,13 @@
this.$refs.submissionModal.show();
},
clearPassword() {
this.submitPassword = null
this.submitPassword = null;
},
handleOk(evt) {
// Prevent modal from closing
evt.preventDefault();
if (this.submitPassword !== null) {
this.handleSubmit()
this.handleSubmit();
}
},
handleSubmit() {
@ -230,14 +230,18 @@
};
var self = this;
Vue.axios
.post("/observation", {
.post(
"/observation",
{
site: this.site,
tutors: this.tutors,
observed: this.description,
whom: this.whom,
type: this.type,
entries: JSON.parse(JSON.stringify(this.observations))
}, axiosConfig)
},
axiosConfig
)
.then(function(response) {
self.$router.push("/complete");
console.log(response);

View File

@ -15,9 +15,8 @@
computed: {
...mapState(["description", "type", "whom", "site", "tutors"])
}
}
};
</script>
<style scoped>
</style>

View File

@ -137,14 +137,16 @@
]),
getTutors: function() {
if (this.site != null) {
Vue.axios.get("/site/" + this.site + "/tutors").then(response => {
Vue.axios
.get("/site/" + this.site + "/tutors")
.then(response => {
this.tutorOptions = response.data;
this.loadingTutors = false;
}).catch(error => {
})
.catch(error => {
if (error.response.status === 404) {
this.$router.push("/dberror");
return;
}
this.errorStatus = error.response.status;
this.errorMessage = error.response.data;