Compare commits
10 Commits
3a803d0af8
...
ee559b57cb
| Author | SHA1 | Date |
|---|---|---|
 Ahmedvolga
|
ee559b57cb | |
|
Ahmedvolga
|
4afd1f7ede | |
|
Ahmedvolga
|
938a0097a2 | |
|
Ahmedvolga
|
8077bc484a | |
|
Ahmedvolga
|
cdd7c1a887 | |
|
Ahmedvolga
|
9f07897ab7 | |
|
Ahmedvolga
|
1196ae5432 | |
|
Ahmedvolga
|
cb7641ee53 | |
|
Ahmedvolga
|
34335ae2a3 | |
|
Ahmedvolga
|
b3931c7ed4 |
|
|
@ -19,8 +19,8 @@
|
||||||
<link rel="stylesheet" href="/css/notification.css">
|
<link rel="stylesheet" href="/css/notification.css">
|
||||||
<link rel="stylesheet" href="/css/navbar.css">
|
<link rel="stylesheet" href="/css/navbar.css">
|
||||||
<link rel="stylesheet" href="/css/options.css">
|
<link rel="stylesheet" href="/css/options.css">
|
||||||
|
<link rel="stylesheet" href="/css/fa-icons.css">
|
||||||
|
|
||||||
<script src="https://kit.fontawesome.com/e8e55b4ad4.js" crossorigin="anonymous"></script>
|
|
||||||
<script src="js/jquery-3.5.1.min.js"></script>
|
<script src="js/jquery-3.5.1.min.js"></script>
|
||||||
<script src="js/jquery.maphilight.min.js"></script>
|
<script src="js/jquery.maphilight.min.js"></script>
|
||||||
<script src="js/axios.min.js"></script>
|
<script src="js/axios.min.js"></script>
|
||||||
|
|
@ -29,23 +29,23 @@
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body style="max-width: 90%;">
|
||||||
|
|
||||||
|
|
||||||
<nav class="navbar">
|
<nav class="navbar">
|
||||||
<div class="navbar-brand" href="/" onclick="window.location.href='/';">
|
<div class="navbar-brand" href="/" onclick="window.location.href='/';">
|
||||||
<img src="/images/sv-org-logo.png" alt="Site Logo">
|
<img src="/images/sv-org-logo.png" alt="Site Logo">
|
||||||
<span>СЕРВИС-ВОЛГА</span> <!-- Title as a span for styling -->
|
<span>СЕРВИС-ВОЛГА - Поиск повторяющихся аппаратов</span> <!-- Title as a span for styling -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="dropdown">
|
<div class="dropdown">
|
||||||
<img src="/images/sv-org-logo.png" alt="User Photo" class="user-photo" onclick="toggleDropdown(event)">
|
<img src="/images/sv-org-logo.png" alt="User Photo" class="user-photo" onclick="toggleDropdown(event)">
|
||||||
<div class="dropdown-menu" id="dropdownMenu">
|
<div class="dropdown-menu" id="dropdownMenu">
|
||||||
<div class="user-details">
|
<div class="user-details">
|
||||||
<img src="/images/sv-org-logo.png" alt="User Photo" class="user-photo"
|
<img src="/images/sv-org-logo.png" alt="User Photo" class="user-photo"
|
||||||
style="width: 60px; height: 60px;"> <!-- Larger photo in dropdown -->
|
style="width: 60px; height: 60px;"> <!-- Larger photo in dropdown -->
|
||||||
<div id="userName" class="user-name" >Admin</div> <!-- Username -->
|
<div id="userName" class="user-name">Admin</div> <!-- Username -->
|
||||||
</div>
|
</div>
|
||||||
<a class="dropdown-item" href="#"><i class="fa-solid fa-user"></i>  Profile</a>
|
<a class="dropdown-item" href="#"><i class="fa-solid fa-user"></i>  Profile</a>
|
||||||
|
|
||||||
|
|
@ -73,38 +73,57 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="pageTitle">
|
<div class="pageTitle">
|
||||||
|
|
||||||
<h3>Поиск повторяющихся аппаратов</h3>
|
|
||||||
<span class="counter"> </span>
|
<span class="counter"> </span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="searchResult">
|
|
||||||
|
|
||||||
<textarea name="" id="textcopied" class="inputHolder22" cols="15" rows="40"></textarea>
|
|
||||||
|
|
||||||
<div id="tablePlace" class="repeated2">
|
|
||||||
<div class="test"></div>
|
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<div class="left-panel">
|
||||||
|
<div class="title-section">
|
||||||
|
Input List
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<textarea id="textcopied" class="inputHoldercheck" rows="15"></textarea>
|
||||||
|
</div>
|
||||||
|
<div class="results-panel">
|
||||||
|
|
||||||
|
|
||||||
|
<div id="tablePlaceSection" class="result-item">
|
||||||
|
<div class="title-section">
|
||||||
|
Search Main Database
|
||||||
|
</div>
|
||||||
|
<table id="tablePlace" class="result-item" border="1"></table>
|
||||||
|
|
||||||
|
<div class="title-section">
|
||||||
|
Search Live Database
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="test"></div>
|
||||||
|
<table id="tablePlace2" class="result-item" border="1"></table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="total-results">
|
||||||
|
<p class="total-results-title">Total Results</p>
|
||||||
|
<div class="title-section">
|
||||||
|
Results Main Database (from uploaded files XLSX)
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<pre id="json-data"></pre>
|
<textarea id="copytablePlace" rows="15" placeholder="Summary of results here..."></textarea>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="title-section">
|
||||||
|
Results Live Database
|
||||||
|
</div>
|
||||||
|
<textarea id="copytablePlace2" rows="15" placeholder="Summary of results here..."></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="copy-text">
|
|
||||||
|
|
||||||
<textarea name="" id="copyPlace" cols="130" rows="50"></textarea>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
|
|
||||||
<footer>
|
<footer>
|
||||||
|
|
||||||
<a> Check Serials <span id="version"></span> © 2024 Ал Омаири Ахмед </a>
|
<a> Check Serials <span id="version"></span> © 2024 Ал Омаири Ахмед </a>
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
|
|
@ -191,18 +191,12 @@ body {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
color: rgb(51, 51, 51);
|
/* color: rgb(51, 51, 51); */
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
color: rgb(209, 209, 209);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* table,
|
|
||||||
th,
|
|
||||||
td {
|
|
||||||
border: 1px solid black;
|
|
||||||
border-collapse: collapse;
|
|
||||||
background-color: aliceblue;
|
|
||||||
padding: 4px;
|
|
||||||
} */
|
|
||||||
|
|
||||||
.visible {
|
.visible {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
@ -255,7 +249,19 @@ footer {
|
||||||
text-decoration: none !important;
|
text-decoration: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.searchResult {}
|
/* .searchResult {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
}
|
||||||
|
.left-panel{
|
||||||
|
width: 20%;
|
||||||
|
}
|
||||||
|
.right-panel{
|
||||||
|
width: 80%;
|
||||||
|
} */
|
||||||
|
|
||||||
.check-butons {
|
.check-butons {
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
|
|
@ -297,6 +303,9 @@ footer {
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.redTable td {
|
||||||
|
padding: 1px 3px;
|
||||||
|
}
|
||||||
|
|
||||||
.bold {
|
.bold {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
@ -310,6 +319,24 @@ footer {
|
||||||
#history {
|
#history {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
place-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
.custom-th, .custom-td {
|
||||||
|
border: 1px solid black;
|
||||||
|
padding: 2px;
|
||||||
|
text-align: left;
|
||||||
|
width: 60px;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.custom-th {
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: #f2f2f2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.copy-text {
|
.copy-text {
|
||||||
|
|
@ -427,7 +454,7 @@ footer {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#excelTable {
|
.tableplace {
|
||||||
font-family: Calibri, sans-serif;
|
font-family: Calibri, sans-serif;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
@ -440,7 +467,7 @@ min-width: 680px;
|
||||||
background-color: yellow; /* Change background color for the second column */
|
background-color: yellow; /* Change background color for the second column */
|
||||||
/* } */
|
/* } */
|
||||||
|
|
||||||
#excelTable tr td {
|
.tableplace tr td {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 0px 6px;
|
padding: 0px 6px;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
|
|
@ -451,7 +478,7 @@ background-color: white;
|
||||||
border-color: red;
|
border-color: red;
|
||||||
border-style: solid !important;
|
border-style: solid !important;
|
||||||
}
|
}
|
||||||
#excelTableContainer {
|
.tableplaceContainer {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
text-align: -webkit-center;
|
text-align: -webkit-center;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
@ -467,7 +494,107 @@ background-color: white;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tableplacedown{
|
||||||
.repeatedx {
|
color: aliceblue;
|
||||||
|
margin: auto;
|
||||||
text-align: -webkit-center;
|
text-align: -webkit-center;
|
||||||
|
/* background-color: white; */
|
||||||
|
display: flex;
|
||||||
|
gap: 5px;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.search2table{
|
||||||
|
color: blue;
|
||||||
|
}
|
||||||
|
.searchlivetable{
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
|
||||||
|
.searchpriomtable{
|
||||||
|
color: green;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.container {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr 9fr; /* Left panel is 1 part, results panel is 3 parts */
|
||||||
|
/* height: calc(100vh - 150px); Adjust height for footer space */
|
||||||
|
height: calc(87vh - 150px);
|
||||||
|
padding: 10px;
|
||||||
|
gap: 10px; /* Space between columns */
|
||||||
|
}
|
||||||
|
|
||||||
|
.left-panel {
|
||||||
|
background-color: #ffffff;
|
||||||
|
padding: 5px;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border-radius: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.inputHoldercheck {
|
||||||
|
width: 100%;
|
||||||
|
height: 96%;
|
||||||
|
resize: vertical; /* Allow vertical resizing */
|
||||||
|
}
|
||||||
|
|
||||||
|
.results-panel {
|
||||||
|
background-color: #ffffff;
|
||||||
|
padding: 20px;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border-radius: 15px;
|
||||||
|
overflow-y: auto; /* Allows scrolling if content exceeds */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.result-item {
|
||||||
|
font-family: Calibri, sans-serif;
|
||||||
|
font-size: 13px;
|
||||||
|
text-align: center;
|
||||||
|
border-style: none;
|
||||||
|
border-collapse: collapse;
|
||||||
|
min-width: 680px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.test {
|
||||||
|
max-width: 14ch; /* Limit width to 14 characters */
|
||||||
|
overflow: hidden; /* Prevent overflow */
|
||||||
|
white-space: nowrap; /* No line breaks */
|
||||||
|
text-overflow: ellipsis; /* Add ellipsis for overflow */
|
||||||
|
}
|
||||||
|
|
||||||
|
.total-results {
|
||||||
|
background-color: #e9ecef;
|
||||||
|
padding: 5px;
|
||||||
|
padding-bottom: 54px;
|
||||||
|
border-top: 2px solid #ccc;
|
||||||
|
/* position: sticky; */
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
|
box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.total-results textarea {
|
||||||
|
width: 100%;
|
||||||
|
resize: none; /* Disable resizing */
|
||||||
|
}
|
||||||
|
|
||||||
|
.total-results-title{
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-section{
|
||||||
|
padding: 3px;
|
||||||
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
@ -6,12 +6,13 @@ document.getElementById("buttonGet").onclick = function () {
|
||||||
const serialsList = data.value.split("\n")
|
const serialsList = data.value.split("\n")
|
||||||
console.log(serialsList);
|
console.log(serialsList);
|
||||||
|
|
||||||
$('#tablePlace').append('<tr><th>Модель</th><th>Сер.номер</th><th>Заявленная неисправность</th><th>Произведенная работа</th><th>Файл</th><th>Сервер</th></tr>')
|
// $('#tablePlace').append('<tr><th>Модель</th><th>Сер.номер</th><th>Заявленная неисправность</th><th>Произведенная работа</th><th>Файл</th><th>Сервер</th></tr>')
|
||||||
|
|
||||||
serialsList.forEach(element => {
|
serialsList.forEach(element => {
|
||||||
if (element) {
|
if (element) {
|
||||||
// console.log(element);
|
// console.log(element);
|
||||||
check(element)
|
check(element);
|
||||||
|
check(element, 'searchLive', 'tablePlace2');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -33,91 +34,139 @@ $('#buttonRest').on('click', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
function check(serialUnchecked) {
|
function check(serialUnchecked, searchLink = 'search2', tablePlace = 'tablePlace') {
|
||||||
const serial = keyboardLayoutSwitch(serialUnchecked)
|
const serial = keyboardLayoutSwitch(serialUnchecked);
|
||||||
if (serial == "") {
|
|
||||||
|
|
||||||
// alert("Ensure you input a value in both fields!");
|
if (serial === "") {
|
||||||
$('#searchText').text('Empty!')
|
displayMessage('Empty!', 'red');
|
||||||
} else {
|
return;
|
||||||
$('#searchText').text(' Sending ... wait')
|
}
|
||||||
$('#buttonGet').css('background-color', 'yellow')
|
|
||||||
|
|
||||||
axios.get('http://'+serverEnv.ip+'/search2?sn=' + serial)
|
displayMessage('Sending ... wait', 'yellow');
|
||||||
.then(response => {
|
$('#buttonGet').css('background-color', 'yellow');
|
||||||
console.log(response);
|
|
||||||
counter = counter + response.data.length
|
|
||||||
if(response.statusText == 'OK'){
|
|
||||||
$('#searchText').text('Search')
|
|
||||||
|
|
||||||
$('#buttonGet').css('background-color', 'chartreuse')
|
fetchData(serial, searchLink)
|
||||||
}
|
.then(data => {
|
||||||
const data = response.data
|
updateUIOnSuccess(data, serial, tablePlace);
|
||||||
let bold = false
|
})
|
||||||
if (response.data.length > 1) {
|
.catch(error => {
|
||||||
bold = true
|
handleError(error, tablePlace);
|
||||||
}
|
});
|
||||||
|
|
||||||
console.log(data);
|
|
||||||
if( data.length == 0){
|
|
||||||
console.log('empty');
|
|
||||||
appendata(false, serial, response.statusText );
|
|
||||||
}
|
|
||||||
for (var key in data) {
|
|
||||||
|
|
||||||
|
|
||||||
console.dir(data[key]);
|
|
||||||
// console.log(data.length);
|
|
||||||
// $('.repeated').append(buildHtmlTable([data[key]]))
|
|
||||||
appendata(data[key], serial, response.statusText, bold ); // The response body
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('.counter').text('найден : ' + counter)
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
|
|
||||||
$('#tablePlace').append('<tr class="redTable"><td>error !</td> <td colspan="4"> No answer from server , try again or ask Ahmed !</td> <td>'+error.code+'</td> </tr>')
|
|
||||||
|
|
||||||
$('#searchText').text(error.message)
|
|
||||||
$('#buttonGet').css('background-color', 'orangered')
|
|
||||||
|
|
||||||
console.error(error);
|
|
||||||
});
|
|
||||||
|
|
||||||
} //end if else
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function fetchData(serial, searchLink) {
|
||||||
|
return axios.get(`http://${serverEnv.ip}/${searchLink}?sn=${serial}`)
|
||||||
|
.then(response => {
|
||||||
|
if (response.statusText !== 'OK') {
|
||||||
|
throw new Error('Server responded with an error');
|
||||||
|
}
|
||||||
|
// counter = counter + response.data.length
|
||||||
|
return response.data;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateUIOnSuccess(data, serial, tablePlace) {
|
||||||
|
let bold = data.length > 1;
|
||||||
|
console.log(data);
|
||||||
|
|
||||||
|
if (data.length === 0) {
|
||||||
|
appendData(false, serial, 'No results found', bold, tablePlace);
|
||||||
|
} else {
|
||||||
|
data.forEach(item => {
|
||||||
|
appendData(item, serial, 'Search successful', bold, tablePlace);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
counter = counter + data.length;
|
||||||
|
$('.counter').text(`найден : ${counter}`);
|
||||||
|
$('#searchText').text('Search');
|
||||||
|
$('#buttonGet').css('background-color', 'chartreuse');
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleError(error, tablePlace) {
|
||||||
|
$('#' + tablePlace).append('<tr class="redTable"><td>error !</td> <td colspan="4"> No answer from server , try again or ask Ahmed !</td> <td>' + error.code + '</td></tr>');
|
||||||
|
$('#searchText').text(error.message);
|
||||||
|
$('#buttonGet').css('background-color', 'orangered');
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
function displayMessage(message, color) {
|
||||||
|
$('#searchText').text(message);
|
||||||
|
$('#buttonGet').css('background-color', color);
|
||||||
|
}
|
||||||
|
|
||||||
const list = document.getElementById("json-data");
|
const list = document.getElementById("json-data");
|
||||||
|
|
||||||
|
function appendData(data, sn, statusText, bold, tablePlace) {
|
||||||
function appendata(data,sn,statusText, bold) {
|
|
||||||
console.log(data);
|
console.log(data);
|
||||||
if(data){
|
|
||||||
// $('#tablePlace').append(buildHtmlTable([data]))
|
|
||||||
let addClass = ''
|
|
||||||
if(bold){addClass = 'bold'}
|
|
||||||
|
|
||||||
$('#tablePlace').append('<tr class="redTable '+ addClass +'"><td>'+data.Model+'</td><td>'+data.SerialNumber+'</td> <td>'+data.Problem+'</td> <td>'+ data.Details +'</td> <td>'+data.filename+'</td><td>'+statusText+'</td> </tr>')
|
|
||||||
|
|
||||||
const xlsxFormat = data.Model + ' ' + data.SerialNumber + ' ' + data.Problem + ' ' + data.Details + ' ' + data.filename + '\n'
|
|
||||||
console.log('thsi data texarea is: ', xlsxFormat);
|
|
||||||
$('#copyPlace').append(xlsxFormat).attr('rows', '5') // Set the number of
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
$('#tablePlace').append(' <tr class="greenTable"><td>ОК</td> <td>'+sn+'</td><td colspan="3">Серийный номер не найден в БД</td> <td>'+statusText+'</td></tr> ')
|
|
||||||
|
|
||||||
|
|
||||||
|
// Check if the table exists; if not, create it
|
||||||
|
let table = document.getElementById(tablePlace);
|
||||||
|
if (!table) {
|
||||||
|
table = document.createElement('table');
|
||||||
|
table.id = tablePlace;
|
||||||
|
document.body.appendChild(table); // or append to a specific parent element
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data) {
|
||||||
|
// Create a new row and cells
|
||||||
|
const row = document.createElement('tr');
|
||||||
|
row.className = 'redTable' + (bold ? ' bold' : '');
|
||||||
|
|
||||||
|
// Create cells for each piece of data
|
||||||
|
const modelCell = createCell(data.Model);
|
||||||
|
const serialNumberCell = createCell(data.SerialNumber);
|
||||||
|
const problemCell = createCell(data.Problem);
|
||||||
|
const detailsCell = createCell(data.Details);
|
||||||
|
const filenameCell = createCell(data.filename);
|
||||||
|
const statusCell = createCell(statusText);
|
||||||
|
|
||||||
|
// Append cells to the row
|
||||||
|
row.appendChild(modelCell);
|
||||||
|
row.appendChild(serialNumberCell);
|
||||||
|
row.appendChild(problemCell);
|
||||||
|
row.appendChild(detailsCell);
|
||||||
|
row.appendChild(filenameCell);
|
||||||
|
row.appendChild(statusCell);
|
||||||
|
|
||||||
|
// Append the row to the table
|
||||||
|
table.appendChild(row);
|
||||||
|
|
||||||
|
// Prepare xlsx format string
|
||||||
|
const xlsxFormat = `${data.Model}\t${data.SerialNumber}\t${data.Problem}\t${data.Details}\t${data.filename}\n`;
|
||||||
|
console.log('This data textarea is: ', xlsxFormat);
|
||||||
|
const copyTextarea = document.getElementById(`copy${tablePlace}`);
|
||||||
|
copyTextarea.value += xlsxFormat; // Append to the textarea
|
||||||
|
copyTextarea.setAttribute('rows', '15'); // Set the number of rows
|
||||||
|
} else {
|
||||||
|
// Create a new row for the "not found" state
|
||||||
|
const row = document.createElement('tr');
|
||||||
|
row.className = 'greenTable';
|
||||||
|
|
||||||
|
const okCell = createCell('ОК');
|
||||||
|
const serialNotFoundCell = createCell(sn);
|
||||||
|
const messageCell = createCell('Серийный номер не найден в БД', { colSpan: 3 });
|
||||||
|
const statusNotFoundCell = createCell(statusText);
|
||||||
|
|
||||||
|
// Append cells to the row
|
||||||
|
row.appendChild(okCell);
|
||||||
|
row.appendChild(serialNotFoundCell);
|
||||||
|
row.appendChild(messageCell);
|
||||||
|
row.appendChild(statusNotFoundCell);
|
||||||
|
|
||||||
|
// Append the row to the table
|
||||||
|
table.appendChild(row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper function to create a cell
|
||||||
|
function createCell(content, options) {
|
||||||
|
const cell = document.createElement('td');
|
||||||
|
cell.textContent = content;
|
||||||
|
if (options && options.colSpan) {
|
||||||
|
cell.colSpan = options.colSpan;
|
||||||
|
}
|
||||||
|
return cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,9 @@ const models = {
|
||||||
"V520": ["331-4", "331-9", "262-", "285-", 11],
|
"V520": ["331-4", "331-9", "262-", "285-", 11],
|
||||||
"VX675": ["331-0", "331-3", "331-0", "333-", "332-", 11],
|
"VX675": ["331-0", "331-3", "331-0", "333-", "332-", 11],
|
||||||
"VX820": ["903-","327-" , 11],
|
"VX820": ["903-","327-" , 11],
|
||||||
"D230": ["233", 10]
|
"D230": ["233", 10],
|
||||||
|
"EVOTOR_5I": ["15", "05", 12],
|
||||||
|
"EVOTOR_73": ["003", 14],
|
||||||
}
|
}
|
||||||
|
|
||||||
manualSelectModel = false; // manual select model
|
manualSelectModel = false; // manual select model
|
||||||
|
|
@ -520,38 +522,84 @@ const cleanAll = () => {
|
||||||
tempDetails = [];
|
tempDetails = [];
|
||||||
$('#titleInput').val('Cleaned!')
|
$('#titleInput').val('Cleaned!')
|
||||||
prepareTable('excelTable', ['Модель','Сер.номер','Заявленная неисправность','Произведенная работа'])
|
prepareTable('excelTable', ['Модель','Сер.номер','Заявленная неисправность','Произведенная работа'])
|
||||||
$('#tablePlace').text('')
|
$('#RepeatedTablePlace').text('')
|
||||||
$('#tablePlace2').text('')
|
$('#SearchLiveTablePlace').text('')
|
||||||
|
$('#SearchPriomTablePlace').text('')
|
||||||
|
|
||||||
const dancers = document.querySelector('.bg-tarakan');
|
const dancers = document.querySelector('.bg-tarakan');
|
||||||
dancers.classList.remove("show-tarakan");
|
dancers.classList.remove("show-tarakan");
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#showStorage').on('click', () => {
|
$('#showStorage').on('click', () => {
|
||||||
|
|
||||||
var textarea = $('<textarea>'); // Create a new textarea element
|
var textarea = $('<textarea>'); // Create a new textarea element
|
||||||
$('#history').html(textarea); // Append the textarea to the div
|
$('#history').html(textarea); // Append the textarea to the div
|
||||||
|
|
||||||
|
// Extract the data from localStorage
|
||||||
const dataEntries = Object.entries(localStorage).map(([key, value]) => ({ key, value: JSON.parse(value) }));
|
const dataEntries = Object.entries(localStorage).map(([key, value]) => ({ key, value: JSON.parse(value) }));
|
||||||
|
|
||||||
// Sort the data entries by date in descending order
|
// Assuming you want to use the parsed 'value' part for table data
|
||||||
dataEntries.sort((a, b) => new Date(b.value.date) - new Date(a.value.date));
|
const tableData = dataEntries.map(entry => entry.value); // Extract values from the entries
|
||||||
|
|
||||||
// Populate the table with the sorted data
|
|
||||||
dataEntries.forEach(entry => {
|
|
||||||
|
|
||||||
if (entry.value.date) {
|
|
||||||
const xlsxFormat = entry.value.model + ' ' + entry.value.serialNumber + ' ' + entry.value.problemList + ' ' + entry.value.fixList + '\n'
|
|
||||||
textarea.append(xlsxFormat).attr('rows', '5') // Set the number of rows to 5
|
|
||||||
.attr('cols', '100'); // Set the number of columns to 50
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('sorted', entry.value);
|
|
||||||
});
|
|
||||||
|
|
||||||
|
const table = createHistoryTable(tableData); // Create the table with data from localStorage
|
||||||
|
$('#history').append(table); // Append the table to the div
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Function to create the table with records
|
||||||
|
function createHistoryTable(data) {
|
||||||
|
const table = document.createElement('table');
|
||||||
|
table.classList.add('custom-table'); // Add custom class for the table
|
||||||
|
|
||||||
|
const headerRow = document.createElement('tr');
|
||||||
|
|
||||||
|
// Create the table headers
|
||||||
|
const headers = ['Model', 'Serial Number', 'Problem List', 'Fix List', 'Date'];
|
||||||
|
headers.forEach((headerText, index) => {
|
||||||
|
const th = document.createElement('th');
|
||||||
|
th.classList.add('custom-th'); // Add custom class for header
|
||||||
|
th.textContent = headerText;
|
||||||
|
th.dataset.index = index; // Add a data attribute for sorting by column index
|
||||||
|
th.addEventListener('click', () => sortTable(table, index)); // Add click listener for sorting
|
||||||
|
headerRow.appendChild(th);
|
||||||
|
});
|
||||||
|
table.appendChild(headerRow);
|
||||||
|
|
||||||
|
// Create the table rows
|
||||||
|
data.forEach(item => {
|
||||||
|
const row = document.createElement('tr');
|
||||||
|
|
||||||
|
row.innerHTML = `
|
||||||
|
<td class="custom-td">${item.model}</td>
|
||||||
|
<td class="custom-td">${item.serialNumber}</td>
|
||||||
|
<td class="custom-td">${item.problemList}</td>
|
||||||
|
<td class="custom-td">${item.fixList}</td>
|
||||||
|
<td class="custom-td">${new Date(item.date).toLocaleString()}</td>
|
||||||
|
`;
|
||||||
|
table.appendChild(row);
|
||||||
|
});
|
||||||
|
|
||||||
|
return table;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to sort the table by a specific column index
|
||||||
|
function sortTable(table, columnIndex) {
|
||||||
|
const rows = Array.from(table.rows).slice(1); // Get all rows except the header
|
||||||
|
const sortedRows = rows.sort((rowA, rowB) => {
|
||||||
|
const cellA = rowA.cells[columnIndex].textContent;
|
||||||
|
const cellB = rowB.cells[columnIndex].textContent;
|
||||||
|
|
||||||
|
// Sort by date (if the column is 'Date')
|
||||||
|
if (columnIndex === 4) { // Date column index
|
||||||
|
return new Date(cellA) - new Date(cellB);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort by text (for other columns)
|
||||||
|
return cellA.localeCompare(cellB);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Remove existing rows and append sorted rows
|
||||||
|
sortedRows.forEach(row => table.appendChild(row));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -562,7 +610,9 @@ const modelImages = {
|
||||||
'D230': './images/devices/d230.png',
|
'D230': './images/devices/d230.png',
|
||||||
'SP580': './images/devices/SP580-PC-5.png',
|
'SP580': './images/devices/SP580-PC-5.png',
|
||||||
'ES600': './images/devices/ES600.png',
|
'ES600': './images/devices/ES600.png',
|
||||||
'VX820': './images/devices/VX820.png'
|
'VX820': './images/devices/VX820.png',
|
||||||
|
// 'EVOTOR_5I': './images/devices/evotor_5i.png',
|
||||||
|
// 'EVOTOR_73': './images/devices/evotor_73.png'
|
||||||
// Add more models as needed
|
// Add more models as needed
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -656,7 +706,8 @@ SerialNumber.addEventListener("submit", (e) => {
|
||||||
for (var key in data) {
|
for (var key in data) {
|
||||||
if (data.hasOwnProperty(key)) {
|
if (data.hasOwnProperty(key)) {
|
||||||
console.dir(data[key]);
|
console.dir(data[key]);
|
||||||
$('.repeated').append(buildHtmlTable([data[key]]))
|
$('#RepeatedTablePlace').text('Повтор:')
|
||||||
|
$('#RepeatedTablePlace').append(buildHtmlTable([data[key]],'search2'))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -671,7 +722,8 @@ SerialNumber.addEventListener("submit", (e) => {
|
||||||
for (var key in data) {
|
for (var key in data) {
|
||||||
if (data.hasOwnProperty(key)) {
|
if (data.hasOwnProperty(key)) {
|
||||||
console.dir(data[key]);
|
console.dir(data[key]);
|
||||||
$('.repeatedx').append(buildHtmlTable([data[key]]))
|
$('#SearchLiveTablePlace').text('Повтор Live:')
|
||||||
|
$('#SearchLiveTablePlace').append(buildHtmlTable([data[key]],'searchlive'))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -681,6 +733,22 @@ SerialNumber.addEventListener("submit", (e) => {
|
||||||
$('.form-btn').css('background-color', 'orangered')
|
$('.form-btn').css('background-color', 'orangered')
|
||||||
});
|
});
|
||||||
|
|
||||||
|
fetchData(keyboardLayoutSwitch(serial.value), 'searchpriom').then(data => {
|
||||||
|
console.log(data); // The response body
|
||||||
|
for (var key in data) {
|
||||||
|
if (data.hasOwnProperty(key)) {
|
||||||
|
console.dir(data[key]);
|
||||||
|
$('#SearchPriomTablePlace').text('АКТ Прием:')
|
||||||
|
$('#SearchPriomTablePlace').append(buildHtmlTable([data[key]],'searchpriom'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error(error);
|
||||||
|
$('#searchText').text(error.message)
|
||||||
|
$('.form-btn').css('background-color', 'orangered')
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
@ -699,14 +767,14 @@ async function fetchData(serial, location) {
|
||||||
console.error('Fetch Error:', error);
|
console.error('Fetch Error:', error);
|
||||||
$('#searchText').text(error.message)
|
$('#searchText').text(error.message)
|
||||||
$('.form-btn').css('background-color', 'orangered')
|
$('.form-btn').css('background-color', 'orangered')
|
||||||
|
|
||||||
throw error; // Re-throw the error to be caught in the main function
|
throw error; // Re-throw the error to be caught in the main function
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function buildHtmlTable(arr) {
|
|
||||||
|
function buildHtmlTable(arr,search) {
|
||||||
const table = document.createElement('table');
|
const table = document.createElement('table');
|
||||||
table.setAttribute('id', 'excelTable');
|
table.setAttribute('id', search);
|
||||||
table.setAttribute('class', 'redtable');
|
table.setAttribute('class', `${search}table tableplace`);
|
||||||
table.setAttribute('border', '2');
|
table.setAttribute('border', '2');
|
||||||
// const columns = addAllColumnHeaders(arr, table);
|
// const columns = addAllColumnHeaders(arr, table);
|
||||||
const columns = addRowWithoutHeaders(arr, table);
|
const columns = addRowWithoutHeaders(arr, table);
|
||||||
|
|
@ -757,12 +825,9 @@ $("#selectmodel").change(function () {
|
||||||
manualSelectModel = true;
|
manualSelectModel = true;
|
||||||
$("#selectmodel").removeClass("blinking");
|
$("#selectmodel").removeClass("blinking");
|
||||||
tempModel = document.getElementById("selectmodel").value;
|
tempModel = document.getElementById("selectmodel").value;
|
||||||
// checkModel(tempSerial, tempModel);
|
|
||||||
cleanCoords();
|
cleanCoords();
|
||||||
imageFromModel(tempModel)
|
imageFromModel(tempModel)
|
||||||
checkDetails()
|
checkDetails()
|
||||||
// console.log(tempSerial, tempModel);
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const checkModel = (serial, models) => {
|
const checkModel = (serial, models) => {
|
||||||
|
|
@ -772,7 +837,6 @@ const checkModel = (serial, models) => {
|
||||||
tempModel = document.getElementById("selectmodel").value;
|
tempModel = document.getElementById("selectmodel").value;
|
||||||
// updateCoords(tempModel);
|
// updateCoords(tempModel);
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@
|
||||||
<div class="select-city">
|
<div class="select-city">
|
||||||
<select name="banks" id="banksList" class="bank-list" placeholder="Banks" onchange="getCityDetails()">
|
<select name="banks" id="banksList" class="bank-list" placeholder="Banks" onchange="getCityDetails()">
|
||||||
<option value="Сбербанк" selected="selected">Сбербанк</option>
|
<option value="Сбербанк" selected="selected">Сбербанк</option>
|
||||||
|
<option value="Частник">Частник</option>
|
||||||
<option value="Алфабанк">Открытие</option>
|
<option value="Алфабанк">Открытие</option>
|
||||||
<option value="Алфабанк">Альфа-Банк</option>
|
<option value="Алфабанк">Альфа-Банк</option>
|
||||||
<option value="Стандарт">Национальный-стандарт</option>
|
<option value="Стандарт">Национальный-стандарт</option>
|
||||||
|
|
@ -74,7 +75,7 @@
|
||||||
<div class="city-selection">
|
<div class="city-selection">
|
||||||
<div id="autocompleteText" class="auto-complete-text"></div>
|
<div id="autocompleteText" class="auto-complete-text"></div>
|
||||||
<input type="text" id="cityInput" placeholder="Type a city..."
|
<input type="text" id="cityInput" placeholder="Type a city..."
|
||||||
onkeyup="filterCities()"" autocomplete=" off">
|
onkeyup="filterCities()" autocomplete=" off">
|
||||||
<div id="cityList"></div>
|
<div id="cityList"></div>
|
||||||
</div>
|
</div>
|
||||||
<input type="text" id="datepicker" autocomplete="off" onchange="getCityDetails()">
|
<input type="text" id="datepicker" autocomplete="off" onchange="getCityDetails()">
|
||||||
|
|
@ -109,8 +110,8 @@
|
||||||
|
|
||||||
<div class="display-info">
|
<div class="display-info">
|
||||||
<!-- <textarea id="titleInput" class="inputHolder" placeholder="" rows="" cols="" name="" form=""> </textarea> -->
|
<!-- <textarea id="titleInput" class="inputHolder" placeholder="" rows="" cols="" name="" form=""> </textarea> -->
|
||||||
<div id="excelTableContainer">
|
<div id="excelTableContainer" class="tableplaceContainer">
|
||||||
<table id="excelTable" border="1">
|
<table id="excelTable" class="tableplace" border="1">
|
||||||
<tr>
|
<tr>
|
||||||
<td>Модель
|
<td>Модель
|
||||||
</td>
|
</td>
|
||||||
|
|
@ -139,6 +140,8 @@
|
||||||
<select name="model" id="selectmodel" class="serialform modelselect" placeholder="Model">
|
<select name="model" id="selectmodel" class="serialform modelselect" placeholder="Model">
|
||||||
<option class="pax" value="S90">S90</option>
|
<option class="pax" value="S90">S90</option>
|
||||||
<option class="pax" value="D230">D230</option>
|
<option class="pax" value="D230">D230</option>
|
||||||
|
<option class="evotor" value="EVOTOR_5I">Evotor 5i</option>
|
||||||
|
<option class="evotor" value="EVOTOR_73">Evotor 73</option>
|
||||||
|
|
||||||
<option class="Alited" value="SP580">Alited SP580</option>
|
<option class="Alited" value="SP580">Alited SP580</option>
|
||||||
<option class="Alited" value="ES600">Alited ES600</option>
|
<option class="Alited" value="ES600">Alited ES600</option>
|
||||||
|
|
@ -184,11 +187,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="tablePlace" class="repeated"> </div>
|
<div id="RepeatedTablePlace" class="tableplacedown"></div>
|
||||||
|
|
||||||
<div id="tablePlace2" class="repeatedx">
|
<div id="SearchLiveTablePlace" class="tableplacedown"></div>
|
||||||
|
|
||||||
</div>
|
<div id="SearchPriomTablePlace" class="tableplacedown"></div>
|
||||||
|
|
||||||
<div class="additionalButtonsContainer">
|
<div class="additionalButtonsContainer">
|
||||||
<div id="top2ButtonsContainer"></div>
|
<div id="top2ButtonsContainer"></div>
|
||||||
|
|
@ -414,6 +417,9 @@
|
||||||
<area shape="poly" gid="sensor" id="sensor" coords=" "
|
<area shape="poly" gid="sensor" id="sensor" coords=" "
|
||||||
data-maphilight='{"strokeColor":"0000ff","strokeWidth":3,"fillColor":"ff0000","fillOpacity":0.6}'
|
data-maphilight='{"strokeColor":"0000ff","strokeWidth":3,"fillColor":"ff0000","fillOpacity":0.6}'
|
||||||
href="#">
|
href="#">
|
||||||
|
<area shape="poly" gid="connector" id="connector" coords=" "
|
||||||
|
data-maphilight='{"strokeColor":"0000ff","strokeWidth":3,"fillColor":"ff0000","fillOpacity":0.6}'
|
||||||
|
href="#">
|
||||||
|
|
||||||
</map>
|
</map>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue