Merge remote-tracking branch 'origin/master' into feature-webapp

2025-10-14 14:20:08 +07:00
parent 8c49bb827f de54d142ae
commit d2a2626fd5
23 changed files with 212 additions and 162 deletions
--- a/html/webpage/assets/js/broadcastzones.js
+++ b/html/webpage/assets/js/broadcastzones.js
@@ -228,7 +228,7 @@ $(document).ready(function () {
            let cells = window.selectedBroadcastZoneRow.find('td');
            /** @type {BroadcastZone} */
            let bz = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                SoundChannel: cells.eq(2).text(),
                Box: cells.eq(3).text(),
@@ -250,7 +250,7 @@ $(document).ready(function () {
            let cells = window.selectedBroadcastZoneRow.find('td');
            /** @type {BroadcastZone} */
            let bz = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                SoundChannel: cells.eq(2).text(),
                Box: cells.eq(3).text(),
--- a/html/webpage/assets/js/languagelink.js
+++ b/html/webpage/assets/js/languagelink.js
@@ -175,7 +175,7 @@ $(document).ready(function () {
            let cells = window.selectedlanguagerow.find('td');
            /** @type {Language} */
            let ll = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                tag: cells.eq(1).text(),
                language: cells.eq(2).text()
            }
@@ -194,7 +194,7 @@ $(document).ready(function () {
            let cells = window.selectedlanguagerow.find('td');
            /** @type {Language} */
            let ll = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                tag: cells.eq(1).text(),
                language: cells.eq(2).text()
            }
--- a/html/webpage/assets/js/messagebank.js
+++ b/html/webpage/assets/js/messagebank.js
@@ -305,7 +305,7 @@ $(document).ready(function () {
            let cells = window.selectedmessagerow.find('td');
            /** @type {MessageBank} */
            let mb = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                language: cells.eq(2).text(),
                aNN_ID: parseInt(cells.eq(3).text()),
@@ -329,7 +329,7 @@ $(document).ready(function () {
            let cells = window.selectedmessagerow.find('td');
            /** @type {MessageBank} */
            let mb = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                language: cells.eq(2).text(),
                aNN_ID: parseInt(cells.eq(3).text()),
--- a/html/webpage/assets/js/schedulebank.js
+++ b/html/webpage/assets/js/schedulebank.js
@@ -252,7 +252,7 @@ $(document).ready(function () {
            let cells = window.selectedschedulerow.find('td');
            /** @type {ScheduleBank} */
            let sr = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                day: cells.eq(2).text(),
                time: cells.eq(3).text(),
@@ -277,7 +277,7 @@ $(document).ready(function () {
            let cells = window.selectedschedulerow.find('td');
            /** @type {ScheduleBank} */
            let sr = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                day: cells.eq(2).text(),
                time: cells.eq(3).text(),
--- a/html/webpage/assets/js/soundbank.js
+++ b/html/webpage/assets/js/soundbank.js
@@ -98,8 +98,9 @@ function fill_soundbanktablebody(vv) {
 * @param {String} language 
 * @param {String} category 
 * @param {String} voiceType 
+ * @param {Function} cb callback function when done
 */
-function reloadSoundbankFiles(language, category, voiceType) {
+function reloadSoundbankFiles(language, category, voiceType, cb=null) {
    window.select2data = [];
    $('#modalpath').empty().trigger('change');
    if (language && language.length > 0) {
@@ -117,6 +118,7 @@ function reloadSoundbankFiles(language, category, voiceType) {
                            width: '100%',
                            dropdownParent: $('#soundbankmodal')
                        });
+                        if (cb) cb();
                    }
                }, (errdata) => {
                    alert("Error loading soundbank files : " + errdata.message);
@@ -278,6 +280,7 @@ $(document).ready(function () {
             * @type {SoundBank}
             */
            let nsb = {
+                index: 0,
                Description: description,
                TAG: tag,
                Category: category,
@@ -302,7 +305,7 @@ $(document).ready(function () {
            let cells = window.selectedsoundrow.find('td');
            /** @type {SoundBank} */
            let sb = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                description: cells.eq(1).text(),
                tag: cells.eq(2).text(),
                category: cells.eq(3).text(),
@@ -325,7 +328,7 @@ $(document).ready(function () {
            let cells = window.selectedsoundrow.find('td');
            /** @type {SoundBank} */
            let sb = {
-                index: cells.eq(0).text(),
+                index: Number(cells.eq(0).text()),
                Description: cells.eq(1).text(),
                TAG: cells.eq(2).text(),
                Category: cells.eq(3).text(),
@@ -336,16 +339,24 @@ $(document).ready(function () {
            if (confirm(`Are you sure to edit soundbank [${sb.index}] Description=${sb.Description} Tag=${sb.TAG}?`)) {
                $modal.modal('show');
                clearSoundbankModal();
+                SetupEventForCategoryLanguageVoiceType();
                $modalindex.val(sb.index).prop('disabled', true);
                $modaldescription.val(sb.Description);
                $modaltag.val(sb.TAG);
                $modalcategory.val(sb.Category);
+                selected_category = sb.Category;
                $modallanguage.val(sb.Language);
+                selected_language = sb.Language;
                $modalvoicetype.val(sb.VoiceType);
-                $('#modalpath').val(sb.Path).trigger('change');
+                selected_voicetype = sb.VoiceType;
+                // load soundbank files for selected language, category, voiceType
+                reloadSoundbankFiles(selected_language, selected_category, selected_voicetype, () => {
+                    // set selected path
+                    $('#modalpath').val(getFilenameFromPath(sb.Path)).trigger('change');
+                });


-                SetupEventForCategoryLanguageVoiceType();
+                
                // event on Click save button
                    $modal.off('click.soundbanksave').on('click.soundbanksave', '#soundbanksave', function () {
                        let description = $modaldescription.val().trim();
@@ -388,7 +399,7 @@ $(document).ready(function () {
                        sb.Language = language;
                        sb.VoiceType = voiceType;
                        sb.Path = path;
-                        fetchAPI(APIURL + "UpdateByIndex/" + sb.index, "PUT", {}, sb, (okdata) => {
+                        fetchAPI(APIURL + "UpdateByIndex/" + sb.index, "PATCH", {}, sb, (okdata) => {
                            reloadSoundBank(APIURL);
                            alert("Success update soundbank : " + okdata.message);
                        }, (errdata) => {
--- a/html/webpage/broadcastzones.html
+++ b/html/webpage/broadcastzones.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -287,7 +286,6 @@
    <script src="assets/js/bs-init.js"></script>
    <script src="assets/js/soundchannel.js"></script>
    <script src="assets/js/broadcastzones.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/language.html
+++ b/html/webpage/language.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -92,7 +91,6 @@
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
    <script src="assets/js/languagelink.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/log.html
+++ b/html/webpage/log.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -54,7 +53,6 @@
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
    <script src="assets/js/log.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/login.html
+++ b/html/webpage/login.html
@@ -7,7 +7,6 @@
    <title>AAS NewGeneration 17092025</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -40,7 +39,6 @@
    </section>
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/messagebank.html
+++ b/html/webpage/messagebank.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -134,7 +133,6 @@
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
    <script src="assets/js/messagebank.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/overview.html
+++ b/html/webpage/overview.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -1325,7 +1324,6 @@
    </div>
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/setting.html
+++ b/html/webpage/setting.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -20,7 +19,6 @@
    </div>
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/soundbank.html
+++ b/html/webpage/soundbank.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -113,7 +112,6 @@
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
    <script src="assets/js/soundbank.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/streamerstatus.html
+++ b/html/webpage/streamerstatus.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -32,7 +31,6 @@
    </div>
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/timer.html
+++ b/html/webpage/timer.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -178,7 +177,6 @@
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
    <script src="assets/js/schedulebank.js"></script>
-    <script src="assets/js/select2.min.js"></script>
 </body>

 </html>
--- a/html/webpage/usermanagement.html
+++ b/html/webpage/usermanagement.html
@@ -7,7 +7,6 @@
    <title>AAS_NewGen_08OKT25</title>
    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
    <link rel="stylesheet" href="assets/css/bss-overrides.css">
-    <link rel="stylesheet" href="assets/css/select2.min.css">
    <link rel="stylesheet" href="assets/css/Login-Form-Basic-icons.css">
    <link rel="stylesheet" href="assets/css/styles.css">
 </head>
@@ -200,7 +199,6 @@
    </div>
    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
    <script src="assets/js/bs-init.js"></script>
-    <script src="assets/js/select2.min.js"></script>
    <script src="assets/js/usermanagement.js"></script>
 </body>