ui functional

neferin12 · Apr 29, 2024 · 7762e73 · 7762e73
1 parent 8cec8a5
commit 7762e73
Show file tree

Hide file tree

Showing 42 changed files with 401 additions and 97 deletions.
diff --git a/gui/tauri-gui/.yarn/install-state.gz b/gui/tauri-gui/.yarn/install-state.gz
diff --git a/gui/tauri-gui/components.d.ts b/gui/tauri-gui/components.d.ts
@@ -7,22 +7,19 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
+    BAlert: typeof import('bootstrap-vue-next')['BAlert']
     BButton: typeof import('bootstrap-vue-next')['BButton']
+    BCard: typeof import('bootstrap-vue-next')['BCard']
     BCollapse: typeof import('bootstrap-vue-next')['BCollapse']
-    BContainer: typeof import('bootstrap-vue-next')['BContainer']
-    BDropdownItem: typeof import('bootstrap-vue-next')['BDropdownItem']
     BForm: typeof import('bootstrap-vue-next')['BForm']
     BFormCheckbox: typeof import('bootstrap-vue-next')['BFormCheckbox']
     BFormGroup: typeof import('bootstrap-vue-next')['BFormGroup']
     BFormInput: typeof import('bootstrap-vue-next')['BFormInput']
     BInputGroup: typeof import('bootstrap-vue-next')['BInputGroup']
-    BInputGroupAppend: typeof import('bootstrap-vue-next')['BInputGroupAppend']
     BNavbarBrand: typeof import('bootstrap-vue-next')['BNavbarBrand']
     BNavbarNav: typeof import('bootstrap-vue-next')['BNavbarNav']
-    BNavbarToggle: typeof import('bootstrap-vue-next')['BNavbarToggle']
-    BNavForm: typeof import('bootstrap-vue-next')['BNavForm']
     BNavItem: typeof import('bootstrap-vue-next')['BNavItem']
-    BNavItemDropdown: typeof import('bootstrap-vue-next')['BNavItemDropdown']
+    BProgress: typeof import('bootstrap-vue-next')['BProgress']
     BTable: typeof import('bootstrap-vue-next')['BTable']
     BTableSimple: typeof import('bootstrap-vue-next')['BTableSimple']
     BTbody: typeof import('bootstrap-vue-next')['BTbody']

diff --git a/gui/tauri-gui/index.html b/gui/tauri-gui/index.html
@@ -7,6 +7,7 @@
     <title>RiSM GUI</title>
   </head>
   <body data-bs-theme="dark">
+<!--  <body>-->
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
   </body>

diff --git a/gui/tauri-gui/logo.png b/gui/tauri-gui/logo.png
diff --git a/gui/tauri-gui/logo.svg b/gui/tauri-gui/logo.svg
diff --git a/gui/tauri-gui/package.json b/gui/tauri-gui/package.json
@@ -16,6 +16,7 @@
     "@tauri-apps/api": "^1.5.4",
     "bootstrap": "^5.3.3",
     "bootstrap-vue-next": "^0.17.2",
+    "bootswatch": "^5.3.3",
     "pinia": "^2.1.7",
     "vue": "^3.4.21",
     "vue-router": "^4.3.0"

diff --git a/gui/tauri-gui/src-tauri/icons/128x128.png b/gui/tauri-gui/src-tauri/icons/128x128.png
diff --git a/gui/tauri-gui/src-tauri/icons/128x128@2x.png b/gui/tauri-gui/src-tauri/icons/128x128@2x.png
diff --git a/gui/tauri-gui/src-tauri/icons/32x32.png b/gui/tauri-gui/src-tauri/icons/32x32.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square107x107Logo.png b/gui/tauri-gui/src-tauri/icons/Square107x107Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square142x142Logo.png b/gui/tauri-gui/src-tauri/icons/Square142x142Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square150x150Logo.png b/gui/tauri-gui/src-tauri/icons/Square150x150Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square284x284Logo.png b/gui/tauri-gui/src-tauri/icons/Square284x284Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square30x30Logo.png b/gui/tauri-gui/src-tauri/icons/Square30x30Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square310x310Logo.png b/gui/tauri-gui/src-tauri/icons/Square310x310Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square44x44Logo.png b/gui/tauri-gui/src-tauri/icons/Square44x44Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square71x71Logo.png b/gui/tauri-gui/src-tauri/icons/Square71x71Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/Square89x89Logo.png b/gui/tauri-gui/src-tauri/icons/Square89x89Logo.png
diff --git a/gui/tauri-gui/src-tauri/icons/StoreLogo.png b/gui/tauri-gui/src-tauri/icons/StoreLogo.png
diff --git a/gui/tauri-gui/src-tauri/icons/icon.icns b/gui/tauri-gui/src-tauri/icons/icon.icns
diff --git a/gui/tauri-gui/src-tauri/icons/icon.ico b/gui/tauri-gui/src-tauri/icons/icon.ico
diff --git a/gui/tauri-gui/src-tauri/icons/icon.png b/gui/tauri-gui/src-tauri/icons/icon.png
diff --git a/gui/tauri-gui/src-tauri/src/main.rs b/gui/tauri-gui/src-tauri/src/main.rs
@@ -1,27 +1,79 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::sync::OnceLock;
+use std::thread::ThreadId;
+use rism::constants::{Points};
+use rism::io::{import_seminars, import_students};
+use rism::rism_classic::run;
+use rism::rism_model_checking::run_model_check;
+use serde_json::to_string;
+use tauri::{ Manager, Window};
+
 const VERSION: &str = env!("CARGO_PKG_VERSION");
+static WINDOW: OnceLock<Window> = OnceLock::new();
+
 
 #[tauri::command]
 fn get_version() -> String {
-  return String::from(VERSION);
+    return String::from(VERSION);
 }
 
 #[tauri::command]
 fn uses_system_z3() -> bool {
-  #[cfg(feature = "bundle_z3")]
-  return false;
+    #[cfg(feature = "bundle_z3")]
+    return false;
+
+    #[cfg(not(feature = "bundle_z3"))]
+    return true;
+}
+
+#[tauri::command]
+async fn run_normal(votes: String, seminars: String, iterations: u32, threads: u16) -> String {
+    let seminars = import_seminars(&*seminars);
+    let students = import_students(&*votes, &seminars);
+
+    let best_iteration = run(&students, &seminars, iterations, Points::default(), threads, send_progress);
+    println!("Done");
+    to_string(&best_iteration).unwrap()
+}
+
+#[tauri::command]
+async fn run_model_checking(votes: String, seminars: String) -> String {
+    let seminars = import_seminars(&*seminars);
+    let students = import_students(&*votes, &seminars);
 
-  #[cfg(not(feature = "bundle_z3"))]
-  return true;
+    let best_iteration = run_model_check(&students, &seminars, Points::default());
+    println!("Done");
+    to_string(&best_iteration).unwrap()
 }
 
+#[derive(Clone, serde::Serialize)]
+struct ProgressPayload {
+    thread_id: u64,
+    progress: u32,
+    total: u32,
+}
+
+fn send_progress(t_id: ThreadId, p: u32, t: u32) {
+    if p % 10000 == 0 {
+        let mut hasher = DefaultHasher::new();
+        t_id.hash(&mut hasher);
+        WINDOW.get().expect("window is available").emit("progress", ProgressPayload { thread_id: hasher.finish(), progress: p, total: t }).expect("Send message");
+    }
+}
 
 fn main() {
-  tauri::Builder::default()
-      .invoke_handler(tauri::generate_handler![get_version,uses_system_z3])
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
+        tauri::Builder::default()
+            .setup(|app| {
+                let window = app.get_window("main").unwrap();
+
+                _ = WINDOW.set(window);
+                Ok(())
+            })
+            .invoke_handler(tauri::generate_handler![get_version,uses_system_z3,run_normal,run_model_checking])
+            .run(tauri::generate_context!())
+            .expect("error while running tauri application");
 }
 
diff --git a/gui/tauri-gui/src-tauri/tauri.conf.json b/gui/tauri-gui/src-tauri/tauri.conf.json
@@ -59,8 +59,8 @@
     "windows": [
       {
         "fullscreen": false,
-        "height": 650,
-        "resizable": false,
+        "height": 700,
+        "resizable": true,
         "title": "RiSM",
         "width": 1000
       }

diff --git a/gui/tauri-gui/src/App.vue b/gui/tauri-gui/src/App.vue
@@ -4,24 +4,35 @@ import {BNavbar} from "bootstrap-vue-next";
 </script>
 
 <template>
-    <BNavbar data-tauri-drag-region id="navbar" variant="primary-subtle" v-b-color-mode="'dark'">
-      <BNavbarBrand tag="h1" class="mb-0">RiSM GUI</BNavbarBrand>
-      <BCollapse id="nav-collapse" is-nav>
-        <BNavbarNav>
-          <BNavItem to="/">New calculation</BNavItem>
-          <BNavItem to="about">About</BNavItem>
-        </BNavbarNav>
-      </BCollapse>
+  <BNavbar data-tauri-drag-region id="navbar" variant="primary" v-b-color-mode="'dark'">
+    <BNavbarBrand tag="h1" class="mb-0">RiSM GUI</BNavbarBrand>
+    <BCollapse id="nav-collapse" is-nav>
+      <BNavbarNav>
+        <BNavItem to="/">New calculation</BNavItem>
+        <BNavItem to="/about">About</BNavItem>
+      </BNavbarNav>
+    </BCollapse>
 
-    </BNavbar>
-    <main class="content">
-      <RouterView/>
-    </main>
+  </BNavbar>
+  <main class="content">
+    <div>
+      <b-card>
+        <RouterView/>
+      </b-card>
+    </div>
+  </main>
 </template>
 
 <style scoped>
 .content {
   padding: 20px;
+  display: flex;
+  justify-content: center;
+}
+
+.content > div {
+  max-width: 100%;
+  width: 900px
 }
 
 #navbar {

diff --git a/gui/tauri-gui/src/assets/logo.svg b/gui/tauri-gui/src/assets/logo.svg
diff --git a/gui/tauri-gui/src/main.ts b/gui/tauri-gui/src/main.ts
@@ -1,4 +1,5 @@
 import 'bootstrap/dist/css/bootstrap.css'
+// import "bootswatch/dist/cyborg/bootstrap.min.css";
 import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'
 
 import { createApp } from 'vue'

diff --git a/gui/tauri-gui/src/router/index.ts b/gui/tauri-gui/src/router/index.ts
@@ -1,23 +1,38 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import {createRouter, createWebHistory} from 'vue-router'
 import HomeView from '../views/HomeView.vue'
 
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
-  routes: [
-    {
-      path: '/',
-      name: 'home',
-      component: HomeView
-    },
-    {
-      path: '/about',
-      name: 'about',
-      // route level code-splitting
-      // this generates a separate chunk (About.[hash].js) for this route
-      // which is lazy-loaded when the route is visited.
-      component: () => import('../views/AboutView.vue')
-    }
-  ]
+    history: createWebHistory(import.meta.env.BASE_URL),
+    routes: [
+        {
+            path: '/',
+            name: 'home',
+            component: HomeView
+        },
+        {
+            path: '/results',
+            name: 'results',
+            component: () => import('../views/Results.vue')
+        },
+        {
+            path: '/run/normal',
+            name: 'run-normal',
+            component: () => import('../views/NormalRun.vue')
+        },
+        {
+            path: '/run/model-checking',
+            name: 'run-model-checking',
+            component: () => import('../views/ModelCheckingRun.vue')
+        },
+        {
+            path: '/about',
+            name: 'about',
+            // route level code-splitting
+            // this generates a separate chunk (About.[hash].js) for this route
+            // which is lazy-loaded when the route is visited.
+            component: () => import('../views/AboutView.vue')
+        }
+    ]
 })
 
 export default router
diff --git a/gui/tauri-gui/src/stores/counter.ts b/gui/tauri-gui/src/stores/counter.ts
diff --git a/gui/tauri-gui/src/stores/data.ts b/gui/tauri-gui/src/stores/data.ts
@@ -0,0 +1,14 @@
+import {defineStore} from "pinia";
+import {type Ref, ref} from "vue";
+
+export const useDataStore = defineStore('data', () => {
+    const votes = ref('');
+    const seminars = ref('');
+    const modelChecking = ref(false);
+    const iterations = ref(1000000);
+    const threads = ref(4);
+
+    const result: Ref<Result | null> = ref(null);
+
+    return {votes, seminars, modelChecking, iterations, threads, result}
+})
diff --git a/gui/tauri-gui/src/types.d.ts b/gui/tauri-gui/src/types.d.ts
@@ -0,0 +1,29 @@
+// Defines a seminar, whether it's a wish or an assigned seminar
+interface Seminar {
+    name: string;
+    capacity: number;
+    id: number;
+    seminar_type: 'Scientific' | 'Practical';
+}
+
+// Defines the structure for a student, including their wishes for scientific and practical seminars
+interface Student {
+    id: number;
+    name: string;
+    w_wishes: Seminar[]; // Wishes for scientific seminars
+    p_wishes?: Seminar[]; // Wishes for practical seminars (optional as your JSON sample has a student missing this field)
+}
+
+// Represents an assignment of a student to seminars, including points for the assignment
+interface Assignment {
+    student: Student;
+    w_seminar?: Seminar; // Assigned scientific seminar
+    p_seminar?: Seminar; // Assigned practical seminar
+    points: number;
+}
+
+// The root structure of your JSON data
+interface Result {
+    points: number;
+    assignments: Assignment[];
+}