diff --git a/components/CustomerSearch.vue b/components/CustomerSearch.vue
index e2377a4..e815ca9 100644
--- a/components/CustomerSearch.vue
+++ b/components/CustomerSearch.vue
@@ -1,8 +1,9 @@
@@ -13,9 +14,9 @@ import { useStore } from 'vuex';
import { computed } from 'vue';
const store = useStore();
-const filtered = computed(() => store.state.assetFiltered);
-const filteredTerm = computed(() => store.state.filteredAssetbyCustomer);
-const customerFilter = ref(store.state.filteredAssetbyCustomer);
+const filtered = computed(() => store.state.filtered);
+const filteredTerm = computed(() => store.state.filteredByCustomer);
+const customerFilter = ref(store.state.filteredByCustomer);
const darkMode = ref(true)
@@ -26,14 +27,14 @@ const updateFilterTerm = () => {
const checkFiltered = () => {
if (!filtered.value) {
- clientFilter.value = ''
+ customerFilter.value = ''
filterList();
}
}
// update the filtered term in the store
const filterList = () => {
- store.commit('updateFilterbyClient', clientFilter.value);
+ store.commit('updateFilterbyCustomer', customerFilter.value);
}
watch(filteredTerm, updateFilterTerm)
@@ -106,8 +107,9 @@ export default {
color: #000;
}
-.input {
+.input-customer {
border: none;
+ margin-left: 1rem;
}
.pre-customer {
diff --git a/components/IssueStateSearch.vue b/components/IssueStateSearch.vue
index d3d5385..3550a00 100644
--- a/components/IssueStateSearch.vue
+++ b/components/IssueStateSearch.vue
@@ -15,8 +15,8 @@ import { computed } from 'vue';
const store = useStore();
const filtered = computed(() => store.state.filtered);
-const filteredTerm = computed(() => store.state.filteredByClient);
-const issueStateFilter = ref(store.state.filteredByClient);
+const filteredTerm = computed(() => store.state.filteredByCustomer);
+const issueStateFilter = ref(store.state.filteredByCustomer);
const darkMode = ref(true)
@@ -34,7 +34,7 @@ const checkFiltered = () => {
// update the filtered term in the store
const filterList = () => {
- store.commit('updateFilterbyClient', issueStateFilter.value);
+ store.commit('updateFilterbyCustomer', issueStateFilter.value);
}
watch(filteredTerm, updateFilterTerm)
diff --git a/components/LoginForm.vue b/components/LoginForm.vue
index a13e686..a3c7fe2 100644
--- a/components/LoginForm.vue
+++ b/components/LoginForm.vue
@@ -83,7 +83,7 @@ const handleLogin = async () => {
// sucessfully logged in
router.push('/home')*/
let res = await signIn( credentials, { callbackUrl: '/home' })
- console.log("res", res)
+ // console.log("res", res)
} catch (err) {
// handle the error
@@ -97,16 +97,16 @@ const testFunctionSignup = async () => {
isError.value = false;
errorMsg.value = '';
- const username = 'franzzzzzrtg'
- const password = '112345678'
- const password_repeat = '112345678'
- const fullName = 'hallo'
- const email = 'test.sdj@web.de'
- const phonenumber = '015736283729'
- const address = 'Strasse'
- const city = 'tuebingen'
- const postcode = '72121'
- const adminBool = false
+ const username = 'adm_tueit'
+ const password = 'SvF=?bfEx7_hV,cMEu4m'
+ const password_repeat = 'SvF=?bfEx7_hV,cMEu4m'
+ const fullName = 'administrator'
+ const email = 'support@tueit.de'
+ const phonenumber = ''
+ const address = ''
+ const city = ''
+ const postcode = ''
+ const adminBool = true
const technician1Bool = false
const technician2Bool = false
const technicianMonitoringBool = false
@@ -132,10 +132,11 @@ const testFunctionSignup = async () => {
}
try {
+
let res = await Axios.post(`https://${clientsideConfig.url}:${clientsideConfig.port}/api/signup`, requestBody);
// something to do with the res?
- console.log(res)
+ // console.log(res)
} catch (err) {
// handle the error
diff --git a/components/server/Asset.vue b/components/server/Asset.vue
index 866ee83..9450fc9 100644
--- a/components/server/Asset.vue
+++ b/components/server/Asset.vue
@@ -217,7 +217,7 @@ const updateConfigItem = async () => {
counter += 1;
}
});
- if (counter == 1) {
+ if (counter == 2) {
alert("This asset name already exists. Please choose an unique asset name or modify respectively delete the old one!");
item.value.assetName = '';
return;
diff --git a/components/server/AssetTable.vue b/components/server/AssetTable.vue
index 74e79ba..046a593 100644
--- a/components/server/AssetTable.vue
+++ b/components/server/AssetTable.vue
@@ -63,8 +63,8 @@ const goToChosenAsset = (id) => {
store.commit('setChosenAsset', id);
store.commit('changeToAsset');
};
-const customerFilter = computed(() => store.state.filteredAssetbyCustomer);
-const assetSearchable = computed(() => store.state.assetSearchable);
+const customerFilter = computed(() => store.state.filteredByCustomer);
+const assetSearchable = computed(() => store.state.searchable);
const assetSearchFilter = ref('');
const darkMode = ref(true)
diff --git a/components/server/IssueSlipTable.vue b/components/server/IssueSlipTable.vue
index bd5a1db..9f9b89e 100644
--- a/components/server/IssueSlipTable.vue
+++ b/components/server/IssueSlipTable.vue
@@ -65,7 +65,7 @@ const goToChosenIssueSlip = (id) => {
store.commit('changeToIssueSlip');
};
-const clientFilter = computed(() => store.state.filteredByClient);
+const customerFilter = computed(() => store.state.filteredByCustomer);
const searchable = computed(() => store.state.searchable);
const issueSlipSearchFilter = ref('');
@@ -80,7 +80,7 @@ const updateSearchTerm = async () => {
//get all issueSlips
const getIssueSlips = async () => {
- if (!(clientFilter.value === '')) {
+ if (!(customerFilter.value === '')) {
await getFilteredIssueSlipsByClient();
} else {
try {
@@ -95,7 +95,7 @@ const getIssueSlips = async () => {
//get all issue slips based on the searched client
const getFilteredIssueSlipsByClient = async () => {
try {
- const response = await Axios.get(`https://${clientsideConfig.url}:${clientsideConfig.port}/api/getSelectedIssueSlipsByClient/${clientFilter.value}`);
+ const response = await Axios.get(`https://${clientsideConfig.url}:${clientsideConfig.port}/api/getSelectedIssueSlipsByClient/${customerFilter.value}`);
issueSlips.value = response.data;
} catch (err) {
console.log(err.response.statusText);
@@ -116,7 +116,7 @@ const searchIssueSlip = async () => {
}
}
-watch(clientFilter, getIssueSlips);
+watch(customerFilter, getIssueSlips);
watch(searchable, updateSearchTerm);
diff --git a/components/server/IssueTable.vue b/components/server/IssueTable.vue
index 8c65fdc..810b224 100644
--- a/components/server/IssueTable.vue
+++ b/components/server/IssueTable.vue
@@ -24,7 +24,7 @@
:class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
-
{{ issue.name }}
@@ -58,7 +58,7 @@ const goToChosenIssue = (id) => {
store.commit('changeToIssueItem');
};
-const stateFilter = computed(() => store.state.filteredByClient);
+const stateFilter = computed(() => store.state.filteredByCustomer);
const searchable = computed(() => store.state.searchable);
const issueSearchFilter = ref('');
diff --git a/components/server/IssueVariant.vue b/components/server/IssueVariant.vue
index 4293e39..9509387 100644
--- a/components/server/IssueVariant.vue
+++ b/components/server/IssueVariant.vue
@@ -9,7 +9,7 @@
Variant of:
{{ nameOfVariant }}
+ :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']"> {{ nameOfVariant }}
diff --git a/components/server/IssueVariants.vue b/components/server/IssueVariants.vue
index e3ebee4..264f82a 100644
--- a/components/server/IssueVariants.vue
+++ b/components/server/IssueVariants.vue
@@ -23,7 +23,7 @@
:class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
-
{{ issueVar.name }}
diff --git a/components/server/MaintenanceVisitsTemplate.vue b/components/server/MaintenanceVisitsTemplate.vue
index 9a56299..9762aa8 100644
--- a/components/server/MaintenanceVisitsTemplate.vue
+++ b/components/server/MaintenanceVisitsTemplate.vue
@@ -1,7 +1,7 @@
{{
- mvt.name }}
+ mvt.name }}
@@ -20,7 +20,8 @@
ID:
- {{ mvt.checklistID }}
+ {{ mvt.checklistID }}
-
-
+
+
-
-
-
+
+
+
+
| |