Show version info in check modal

gui/src/components/main_startup_check.vue

@@ -6,7 +6,7 @@ import main_rig_control from "./main_rig_control.vue";
 import main_audio from "./main_audio.vue";
 import infoScreen_updater from "./infoScreen_updater.vue";
 
-import { saveModemConfig } from "../js/api";
+import { getModemVersion, saveModemConfig } from "../js/api";
 
 import { setActivePinia } from "pinia";
 import pinia from "../store/index";
@@ -24,9 +24,12 @@ const state = useStateStore(pinia);
 import { startModem, stopModem } from "../js/api";
 import { getModemConfig } from "../js/api";
 
+const version = import.meta.env.PACKAGE_VERSION;
+
 // start modemCheck modal once on startup
 onMounted(() => {
   getModemConfig();
+  getModemVersion();
   new Modal("#modemCheck", {}).show();
   if (state.is_modem_running == false){
 
@@ -65,28 +68,7 @@ function getModemState(){
         </div>
         <div class="modal-body">
           <div class="accordion" id="startupCheckAccordion">
-            <!-- Version Section -->
-            <div class="accordion-item">
-              <h2 class="accordion-header">
-                <button
-                  class="accordion-button collapsed"
-                  type="button"
-                  data-bs-target="#versionCheckCollapse"
-                  data-bs-toggle="collapse"
-                >
-                  Version
-                  <span class="badge ms-2 bg-warning">Update needed</span>
-                </button>
-              </h2>
-              <div
-                id="versionCheckCollapse"
-                class="accordion-collapse collapse"
-              >
-                <div class="accordion-body">
-                  <infoScreen_updater />
-                </div>
-              </div>
-            </div>
+           
             <!-- Network Section -->
             <div class="accordion-item">
               <h2 class="accordion-header">
@@ -216,6 +198,43 @@ function getModemState(){
                 </div>
               </div>
             </div>
+             <!-- Version Section -->
+             <div class="accordion-item">
+              <h2 class="accordion-header">
+                <button
+                  class="accordion-button collapsed"
+                  type="button"
+                  data-bs-target="#versionCheckCollapse"
+                  data-bs-toggle="collapse"
+                >
+                  Version
+                  <span class="badge ms-2 bg-warning">Update needed</span>
+                </button>
+              </h2>
+              <div
+                id="versionCheckCollapse"
+                class="accordion-collapse collapse"
+              >
+                <div class="accordion-body">
+                  <button
+        class="btn btn-secondary btn-sm ms-1 me-1"
+        type="button"
+        disabled
+      >
+        GUI version | {{ version }}
+      </button>
+
+      <button
+        class="btn btn-secondary btn-sm ms-1 me-1"
+        type="button"
+        disabled
+      >
+        Modem version | {{ state.modem_version }}
+      </button>
+                  <infoScreen_updater />
+                </div>
+              </div>
+            </div>
           </div>
         </div>
         <div class="modal-footer">

gui/src/components/main_top_navbar.vue

@@ -22,7 +22,7 @@ import { saveSettingsToFile } from "../js/settingsHandler";
         Modem Connection {{ state.modem_connection }}
       </span>
       <span class="badge bg-secondary me-4">
-        Modem {{ state.modem_running_state }}
+        Modem {{ state.is_modem_running }}
       </span>
       <span class="badge bg-secondary me-4">
         RIG Control {{ state.rigctld_started }}

gui/src/js/api.js

@@ -19,3 +19,8 @@ export function startModem() {
 export function stopModem() {
   postToServer("localhost", 5000, "modem/stop", null);
 }
+
+export function getModemVersion() {
+  getFromServer("localhost", 5000, "version", null);
+
+}

gui/src/js/rest.js

@@ -7,6 +7,7 @@ import {
   processModemAudioDevices,
   processModemSerialDevices,
   getModemConfigAsJSON,
+  processModemVersion,
 } from "../js/settingsHandler.ts";
 
 export async function getFromServer(host, port, endpoint) {
@@ -59,7 +60,9 @@ function restDataDispatcher(endpoint, data) {
     case "devices/serial":
       processModemSerialDevices(data);
       break;
-
+    case "version":
+      processModemVersion(data);
+      break;
     default:
       console.log("Wrong endpoint:" + endpoint);
   }

gui/src/js/settingsHandler.ts

@@ -12,6 +12,9 @@ const settings = useSettingsStore(pinia);
 import { useAudioStore } from "../store/audioStore.js";
 const audioStore = useAudioStore(pinia);
 
+import { useStateStore } from "../store/stateStore";
+const stateStore = useStateStore(pinia);
+
 import { postToServer, getFromServer } from "./rest.js";
 
 // ---------------------------------
@@ -152,6 +155,10 @@ export function processModemAudioDevices(data) {
 export function processModemSerialDevices(data) {
   settings.serial_devices = data;
 }
+export function processModemVersion(data) {
+  //data = JSON.parse(data);
+  stateStore.modem_version=data["version"];
+}
 
 export function getModemConfigAsJSON() {
   // create json output from settings

modem/server.py

@@ -10,6 +10,7 @@ import server_commands
 import service_manager
 import state_manager
 import explorer
+from static import Modem as modeminfo
 
 
 app = Flask(__name__)
@@ -148,6 +149,10 @@ def post_modem_stop():
     app.modem_service.put("stop")
     return api_response(request.json)
 
+@app.route('/version', methods=['GET'])
+def get_modem_version():
+    return api_response({"version": modeminfo.version})
+
 
 # @app.route('/modem/arq_connect', methods=['POST'])
 # @app.route('/modem/arq_disconnect', methods=['POST'])