Skip to content
Extraits de code Groupes Projets
Vérifiée Valider a7b633d9 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

Fix search in DB

parent 23c203b1
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!3Dev kubat
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
</style> </style>
<script> <script>
$(document).ready(() => { $(document).ready(() => {
$('#filterInput').on('keyup', () => { $('#filterInput').on('keypress', e => {
var value = $(this).val().toLowerCase(); /* On 'Return'. */
$('#panelLeft *').filter(() => { if (e.which != 13) return;
$(this).toggle( ipcRenderer.send(
$(this).text().toLowerCase().indexOf(value) > -1 'reload-db-request',
); $('#filterInput').val()
}); );
}); });
}); });
</script> </script>
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
class="d-flex flex-row bd-highlight mb-3 row card" class="d-flex flex-row bd-highlight mb-3 row card"
></div> ></div>
<div id="panelWrapper" class="row"> <div id="panelWrapper" class="row">
<div <ul
id="panelLeft" id="panelLeft"
class="col panel d-flex flex-column bd-highlight mb-3" class="col panel d-flex flex-column bd-highlight mb-3"
></div> ></ul>
<div <ul
id="panelRight" id="panelRight"
class="col panel d-flex flex-column bd-highlight mb-3" class="col panel d-flex flex-column bd-highlight mb-3"
></div> ></ul>
</div> </div>
<div <div
id="progressBar" id="progressBar"
......
...@@ -100,18 +100,18 @@ ipcRenderer.on('reload-db-responce', (event, arg) => { ...@@ -100,18 +100,18 @@ ipcRenderer.on('reload-db-responce', (event, arg) => {
var karaList = ''; var karaList = '';
logger.debug(`Web page got reload-db`); logger.debug(`Web page got reload-db`);
arg.forEach(kara => { arg.forEach(kara => {
karaList += `<div class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 karaCard"> karaList += `<li class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 karaCard">
<span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.language}</b></span> <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.language}</b></span>
<span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.cat}</b></span> <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.cat}</b></span>
<span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.type}</b></span> <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.type}</b></span>
<div class="karaElement p-2 bd-highlight mr-auto"><b>${kara.source}<br> ${kara.title}</b> <i>[${kara.author}]</i></div> <span class="karaElement p-2 bd-highlight mr-auto"><b>${kara.source}<br> ${kara.title}</b> <i>[${kara.author}]</i></span>
<div class="karaElement p-2 bd-highlight"> <div class="karaElement p-2 bd-highlight">
<div class="d-flex flex-row bd-highlight mb-3 btn-group karaActionBtnGroup" role="group"> <div class="d-flex flex-row bd-highlight mb-3 btn-group karaActionBtnGroup" role="group">
<button class="btn btn-outline-light karaActionBtn"><i class="fas fa-plus"></i></button> <button class="btn btn-outline-light karaActionBtn"><i class="fas fa-plus"></i></button>
<button class="btn btn-outline-light karaActionBtn"><i class="fas fa-level-up-alt"></i></button> <button class="btn btn-outline-light karaActionBtn"><i class="fas fa-level-up-alt"></i></button>
</div> </div>
</div> </div>
</div>`; </li>`;
}); });
document.getElementById('panelLeft').innerHTML = karaList; document.getElementById('panelLeft').innerHTML = karaList;
}); });
...@@ -121,11 +121,11 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => { ...@@ -121,11 +121,11 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => {
var karaList = ''; var karaList = '';
logger.debug(`Web page got reload-queue`); logger.debug(`Web page got reload-queue`);
arg.forEach(kara => { arg.forEach(kara => {
karaList += `<div class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 karaCard"> karaList += `<li class="card p-2 bd-highlight shadow-none d-flex flex-row bd-highlight mb-3 karaCard">
<span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.language}</b></span> <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.language}</b></span>
<span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.cat}</b></span> <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.cat}</b></span>
<span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.type}</b></span> <span class="karaElement text-uppercase p-2 bd-highlight badge badge-light"><b>${kara.type}</b></span>
<div class="karaElement p-2 bd-highlight mr-auto"><b>${kara.source}<br> ${kara.title}</b> <i>[${kara.author}]</i></div> <span class="karaElement p-2 bd-highlight mr-auto"><b>${kara.source}<br> ${kara.title}</b> <i>[${kara.author}]</i></span>
<span class="karaElement p-3 bd-highlight"><b>${kara.position}</b></span> <span class="karaElement p-3 bd-highlight"><b>${kara.position}</b></span>
<div class="karaElement p-2 bd-highlight"> <div class="karaElement p-2 bd-highlight">
<div class="d-flex flex-row bd-highlight mb-3 btn-group karaActionBtnGroup" role="group"> <div class="d-flex flex-row bd-highlight mb-3 btn-group karaActionBtnGroup" role="group">
...@@ -133,7 +133,7 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => { ...@@ -133,7 +133,7 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => {
<button class="btn btn-outline-light karaActionBtn"><i class="fas fa-play"></i></button> <button class="btn btn-outline-light karaActionBtn"><i class="fas fa-play"></i></button>
</div> </div>
</div> </div>
</div>`; </li>`;
}); });
document.getElementById('panelRight').innerHTML = karaList; document.getElementById('panelRight').innerHTML = karaList;
}); });
...@@ -143,9 +143,15 @@ ipcMain.on('cmd-clear', (event, arg) => { ...@@ -143,9 +143,15 @@ ipcMain.on('cmd-clear', (event, arg) => {
* The `arg` is the HTML object of the pannel */ * The `arg` is the HTML object of the pannel */
ipcMain.on('reload-db-request', (event, arg) => { ipcMain.on('reload-db-request', (event, arg) => {
logger.info('Reloading the DB content'); logger.info('Reloading the DB content');
myDb.all().then(karas => { var callback = karas => {
event.reply('reload-db-responce', karas); event.reply('reload-db-responce', karas);
}); };
if (arg) {
logger.debug(`Reload DB with search '${arg}'`);
myDb.search(arg).then(callback);
} else {
myDb.all().then(callback);
}
}); });
/* Send the queue to the webpage when asked to */ /* Send the queue to the webpage when asked to */
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter