diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.html b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.html index 365cb95..7f6b21a 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.html +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.html @@ -9,9 +9,6 @@

Customers


- Want to add a new line? -
-
@@ -23,7 +20,6 @@
-

Add a new line

diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.js b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.js index 345ee46..ce880f8 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.js +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/customers/customers.js @@ -32,7 +32,7 @@ function display() document.getElementById('resultarea').innerHTML += '' + '' + - 'Add new' + + '' + '' + ''; } @@ -77,7 +77,7 @@ function editcustomer(id) '' + '' + '' + - '' + + '' + '' + '' + '' + @@ -130,6 +130,7 @@ function savecustomer(method) .then(data => { console.log("Success: ", data) + document.getElementById('forms').innerHTML = ''; document.getElementById('saveresult').innerHTML = ''; document.getElementById('saveresult').innerHTML += 'Saved customer ' + customer_name + ' successfully'; diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.html b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.html index 799bdaf..228ab1c 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.html +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.html @@ -9,9 +9,6 @@

Employees


- Want to add a new line? -
-
ID
Name
@@ -23,36 +20,7 @@
-

Add a new line

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID
Name
Email
Phone
Maintainer ID
Manager ID
-

+
+

\ No newline at end of file diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.js b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.js index 21acaee..7f643d5 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.js +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/employees/employees.js @@ -25,78 +25,141 @@ function display() '' + '' + '' - + '' + + '' + ''; }); -} - -function updateemployee(id) -{ - let employee_id = document.getElementById('in_id').value; - let employee_name = document.getElementById('in_name').value; - let employee_email = document.getElementById('in_email').value; - let employee_phone = document.getElementById('in_phone').value; - let employee_manager_id = document.getElementById('in_manager_id').value; - let employee_maintainer_id = document.getElementById('in_maintainer_id').value; - - fetch ('https://localhost:5001/api/Employee/' + id, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - id: employee_id, - name: employee_name, - email: employee_email, - phone: employee_phone, - manager_id: employee_manager_id, - maintainer_id: employee_maintainer_id - }) - }) + document.getElementById('resultarea').innerHTML += + '' + + '' + + '' + + '' + + ''; } function addemployee() { - let employee_id = document.getElementById('in_id').value; - let employee_name = document.getElementById('in_name').value; - let employee_email = document.getElementById('in_email').value; - let employee_phone = document.getElementById('in_phone').value; - let employee_manager_id = document.getElementById('in_manager_id').value; - let employee_maintainer_id = document.getElementById('in_maintainer_id').value; + document.getElementById('forms').innerHTML = ''; + document.getElementById('forms').innerHTML += + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
ID
Name
Email
Phone
Manager ID
Maintainer ID
'; +} + +function editemployee(id) +{ + existing_item = employees.find(x => x.id == id); + + document.getElementById('forms').innerHTML = ''; + document.getElementById('forms').innerHTML += + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
ID
Name
Email
Phone
Manager ID
Maintainer ID
'; +} + +function saveemployee(method) +{ + if (method != 'POST' && method != 'PUT') + { + console.error('Invalid method: ' + method); + return; + } + + employee_id = document.getElementById('in_id').value; + employee_name = document.getElementById('in_name').value; + employee_email = document.getElementById('in_email').value; + employee_phone = document.getElementById('in_phone').value; + employee_manager_id = document.getElementById('in_manager_id').value; + employee_maintainer_id = document.getElementById('in_maintainer_id').value; fetch('https://localhost:5001/api/Employee', { - method: 'PUT', + method: method, headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ id: employee_id, name: employee_name, email: employee_email, phone: employee_phone, - manager_id: employee_manager_id, - maintainer_id: employee_maintainer_id + maintaineR_ID: employee_maintainer_id, + manageR_ID: employee_manager_id }) }) .then(response => response) .then(data => { console.log("Success: ", data) - - document.getElementById('addresult').innerHTML = ''; - document.getElementById('addresult').innerHTML += - 'Added employee ' + employee_name + ' successfully'; - + + document.getElementById('forms').innerHTML = ''; + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Saved employee ' + employee_name + ' successfully'; + getemployees(); - + }) .catch(error => { console.error("Error: ", error); - - document.getElementById('addresult').innerHTML = ''; - document.getElementById('addresult').innerHTML += - 'Failed to add maintainer team ' + employee_name; + + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Failed to save employee ' + employee_name; }); } function deleteemployee(id) { + document.getElementById('forms').innerHTML = ''; + fetch('https://localhost:5001/api/Employee/' + id, { method: 'DELETE', headers: { 'Content-Type': 'application/json' }, @@ -105,6 +168,11 @@ function deleteemployee(id) .then(data => { console.log("Success: ", data) + + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Deleted employee number ' + id + ' successfully'; + getemployees(); }) .catch(error => console.error("Error: ", error)); diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.html b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.html index d856273..fd085e7 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.html +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.html @@ -2,15 +2,12 @@ - Maintainer Team + Teams -

Maintainer team

-
- Want to add a new line? -
+

Maintainer teams


@@ -23,28 +20,7 @@
-

Add a new line

- - - - - - - - - - - - - - - - - - - - -
ID
Name
Email
Leader ID
-

+
+

- + \ No newline at end of file diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.js b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.js index 3b69fb3..0f39c60 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.js +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/maintainer_teams/maintainerteam.js @@ -1,13 +1,13 @@ -let maintainerteams = []; -getmaintainerteams(); +let teams = []; +getteams(); -async function getmaintainerteams() +async function getteams() { await fetch('https://localhost:5001/api/MaintainerTeam') .then(x => x.json()) .then(y => { - maintainerteams = y; - console.log(maintainerteams); + teams = y; + console.log(teams); display(); }); } @@ -16,79 +16,131 @@ function display() { document.getElementById('resultarea').innerHTML = ''; - maintainerteams.forEach(t => { + teams.forEach(t => { document.getElementById('resultarea').innerHTML += '' + t.id + '' + t.name + '' - + '' + + '' + '' - + '' + + '' + ''; }); + document.getElementById('resultarea').innerHTML += + '' + + '' + + '' + + '' + + ''; } -function updatemaintainerteam(id) +function addteam() { - let maintainerteam_id = document.getElementById('in_id').value; - let maintainerteam_name = document.getElementById('in_name').value; - let maintainerteam_email = document.getElementById('in_email').value; - let maintainerteam_leader_id = document.getElementById('in_leader_id').value; - - fetch ('https://localhost:5001/api/MaintainerTeam/' + id, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - id: maintainerteam_id, - name: maintainerteam_name, - email: maintainerteam_email, - leader_id: maintainerteam_leader_id - }) - }) + document.getElementById('forms').innerHTML = ''; + document.getElementById('forms').innerHTML += + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
ID
Name
Email
Leader ID
'; } -function addmaintainerteam() +function editteam(id) { - let maintainerteam_id = document.getElementById('in_id').value; - let maintainerteam_name = document.getElementById('in_name').value; - let maintainerteam_email = document.getElementById('in_email').value; - let maintainerteam_leader_id = document.getElementById('in_leader_id').value; + existing_item = teams.find(x => x.id == id); + + document.getElementById('forms').innerHTML = ''; + document.getElementById('forms').innerHTML += + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
ID
Name
Email
Leader ID
'; +} + +function saveteam(method) +{ + if (method != 'POST' && method != 'PUT') + { + console.error('Invalid method: ' + method); + return; + } + + team_id = document.getElementById('in_id').value; + team_name = document.getElementById('in_name').value; + team_email = document.getElementById('in_email').value; + team_leader_id = document.getElementById('in_leader_id').value; fetch('https://localhost:5001/api/MaintainerTeam', { - method: 'PUT', + method: method, headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ - id: maintainerteam_id, - name: maintainerteam_name, - email: maintainerteam_email, - leader_id: maintainerteam_leader_id + id: team_id, + name: team_name, + email: team_email, + leadeR_ID: team_leader_id }) }) .then(response => response) .then(data => { console.log("Success: ", data) - - document.getElementById('addresult').innerHTML = ''; - document.getElementById('addresult').innerHTML += - 'Added maintainer team ' + maintainerteam_name + ' successfully'; - - getmaintainerteams(); - + + document.getElementById('forms').innerHTML = ''; + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Saved team ' + team_name + ' successfully'; + + getteams(); + }) .catch(error => { console.error("Error: ", error); - - document.getElementById('addresult').innerHTML = ''; - document.getElementById('addresult').innerHTML += - 'Failed to add maintainer team ' + maintainerteam_name; + + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Failed to save team ' + team_name; }); } -function deletemaintainerteam(id) +function deleteteam(id) { + document.getElementById('forms').innerHTML = ''; + fetch('https://localhost:5001/api/MaintainerTeam/' + id, { method: 'DELETE', headers: { 'Content-Type': 'application/json' }, @@ -97,7 +149,12 @@ function deletemaintainerteam(id) .then(data => { console.log("Success: ", data) - getmaintainerteams(); + + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Deleted team number ' + id + ' successfully'; + + getteams(); }) .catch(error => console.error("Error: ", error)); } \ No newline at end of file diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.html b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.html index dd51bfd..1d2a06a 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.html +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.html @@ -9,9 +9,6 @@

Services


- Want to add a new line? -
-
@@ -23,49 +20,7 @@
-
-

Add a new line

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID
Maintainer
Name
Version
Account
Notes
Service domain
IP
Port
-
+
+

- + \ No newline at end of file diff --git a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.js b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.js index b6db9fd..99b210e 100644 --- a/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.js +++ b/WD7UVN_SzTGUI_2023242.Client.JS/wwwroot/services/services.js @@ -1,7 +1,7 @@ let services = []; -getServices(); +getservices(); -async function getServices() +async function getservices() { await fetch('https://localhost:5001/api/Service') .then(x => x.json()) @@ -23,90 +23,174 @@ function display() '' + t.name + '' - + '' + + '' + '' - + '' + + '' + ''; }); + + document.getElementById('resultarea').innerHTML += + '' + + '' + + '' + + '' + + ''; } -function updateService(id) +function addservice() { - let service_id = document.getElementById('in_id').value; - let service_maintainer_id = document.getElementById('in_maintainer_id').value; - let service_name = document.getElementById('in_name').value; - let service_version = document.getElementById('in_version').value; - let service_account = document.getElementById('in_account').value; - let service_notes = document.getElementById('in_notes').value; - let service_domain = document.getElementById('in_domain').value; - let service_ip = document.getElementById('in_ip').value; - let service_port = document.getElementById('in_port').value; - - fetch ('https://localhost:5001/api/Service/' + id, { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - id: service_id, - maintainer_id: service_maintainer_id, - name: service_name, - version: service_version, - account: service_account, - notes: service_notes, - service_domain: service_domain, - ip: service_ip, - port: service_port - }) - }) + document.getElementById('forms').innerHTML = ''; + document.getElementById('forms').innerHTML += + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
ID
Name
IP address
Port
Version
Account
Service domain
Notes
Maintainer ID
'; } -function addService() +function editservice(id) { - let service_id = document.getElementById('in_id').value; - let service_maintainer_id = document.getElementById('in_maintainer_id').value; - let service_name = document.getElementById('in_name').value; - let service_version = document.getElementById('in_version').value; - let service_account = document.getElementById('in_account').value; - let service_notes = document.getElementById('in_notes').value; - let service_domain = document.getElementById('in_domain').value; - let service_ip = document.getElementById('in_ip').value; - let service_port = document.getElementById('in_port').value; + existing_item = services.find(x => x.id == id); + + document.getElementById('forms').innerHTML = ''; + document.getElementById('forms').innerHTML += + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
ID
Name
IP address
Port
Version
Account
Service domain
Notes
Maintainer ID
'; +} + +function saveservice(method) +{ + if (method != 'POST' && method != 'PUT') + { + console.error('Invalid method: ' + method); + return; + } + + service_id = document.getElementById('in_id').value; + service_name = document.getElementById('in_name').value; + service_ip = document.getElementById('in_ip_address').value; + service_port = document.getElementById('in_port').value; + service_version = document.getElementById('in_version').value; + service_account = document.getElementById('in_account').value; + service_service_domain = document.getElementById('in_service_domain').value; + service_notes = document.getElementById('in_notes').value; + service_maintainer_id = document.getElementById('in_maintainer_id').value; fetch('https://localhost:5001/api/Service', { - method: 'PUT', + method: method, headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ id: service_id, - maintainer_id: service_maintainer_id, name: service_name, + ip: service_ip, + port: service_port, version: service_version, account: service_account, + servicE_DOMAIN: service_service_domain, notes: service_notes, - service_domain: service_domain, - ip: service_ip, - port: service_port + maintaineR_ID: service_maintainer_id }) }) .then(response => response) .then(data => { console.log("Success: ", data) - - document.getElementById('addresult').innerHTML = ''; - document.getElementById('addresult').innerHTML += - '

Added service ' + service_name + ' successfully

'; - - getServices(); + + document.getElementById('forms').innerHTML = ''; + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Saved service ' + service_name + ' successfully'; + + getservices(); + }) .catch(error => { console.error("Error: ", error); - - document.getElementById('addresult').innerHTML = ''; - document.getElementById('addresult').innerHTML += - '

Failed to add service ' + service_name + '

'; + + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Failed to save service ' + service_name; }); } -function deleteService(id) +function deleteservice(id) { + document.getElementById('forms').innerHTML = ''; + fetch('https://localhost:5001/api/Service/' + id, { method: 'DELETE', headers: { 'Content-Type': 'application/json' }, @@ -115,7 +199,12 @@ function deleteService(id) .then(data => { console.log("Success: ", data) - getServices(); + + document.getElementById('saveresult').innerHTML = ''; + document.getElementById('saveresult').innerHTML += + 'Deleted service number ' + id + ' successfully'; + + getservices(); }) .catch(error => console.error("Error: ", error)); } \ No newline at end of file