End of life, last commit

Author: isuretpolos

README.md

@@ -3,6 +3,9 @@ Open Source Radionics
 
 ![Dashboard](https://raw.githubusercontent.com/isuretpolos/AetherOnePi/master/documentation/screenshots/analysis.jpg)
 
+## End of life
+I stop the maintenance for this project and will invest all my energies into the development of the new **AetherOnePy** (AOPy). Naturally this repository remains alife for everyone.
+
 ## User manual (READ IT)
 **Please read first the [AetherOnePi User Manual](https://radionics.home.blog/aetheonepi/)**, because it explains **step by step** the most important features and techniques for analysis and broadcasting.
 
@@ -19,6 +22,7 @@ or download the Beta which is build after each change on the [Action tab](https:
 Subscribe to my blog(s) and join the [VK community](https://vk.com/aetherone), [Reddit](https://www.reddit.com/r/digitalradionics/) or chat with **Thalia** on [Facebook MorphicEngineering Group](https://www.facebook.com/groups/morphicengineering).
 
 # Feature History
+- 2024-12-13 **End of life** reached. New project AetherOne**Py** will replace AetherOne**Pi**
 - 2024-04-04 Anomaly Search in the Map
 - 2024-03-15 Map Analysis, browser UI
 - 2024-02-17 bugfixes and experimental features that will be revealed in the next version

documentation/dashboardNews.txt

@@ -1,12 +1,11 @@
 Welcome to AetherOnePi, free Radionics for everyone!!!
 
-The most current version is the 1.3.8 with useful improvements!
+END OF LIFE - new project will be AetherOnePy
 
 Read the documentation by clicking on the button "DOCUMENTATION".
 Else join the PATREON community if you have questions and if
 you want to contribute with your experience to the open source
 project.
 
 There is also a new blog on radionics in German.
-A free book is currently in the works!
 You can chat also with me via email: [email protected]

pom.xml

@@ -9,7 +9,7 @@
     <description>Open Source Radionics</description>
 
     <properties>
-        <aether.version>1.3.8</aether.version>
+        <aether.version>1.3.9</aether.version>
         <java.version>1.8</java.version>
         <commons-io.version>2.7</commons-io.version>
         <pi4j-core.version>1.2</pi4j-core.version>

src/main/java/de/isuret/polos/AetherOnePi/processing2/elements/DashboardScreen.java

@@ -94,6 +94,7 @@ public void draw() {
         }
 
         for (String dataBaseName : p.getDataService().getDashboardInformations().getRecentlyLoadedCases()) {
+            if (dataBaseName.contains("dashboard")) continue;
             if (p.mouseX >= 50 && p.mouseX < 300 && p.mouseY < y && p.mouseY >= y - 20) {
                 p.noStroke();
                 p.fill(0,255,0,50f);

src/main/java/de/isuret/polos/AetherOnePi/server/AetherOneServer.java

@@ -77,8 +77,13 @@ public void init(Location location) {
             ctx.json(settings);
         });
 
+        app.get("case/current", ctx -> {ctx.json(p.getCaseObject());});
         app.get("case", ctx -> {
-           ctx.json(p.getCaseObject());
+            if (ctx.queryParam("name") != null) {
+                ctx.json(p.getDataService().loadCase(ctx.queryParam("name")));
+            } else {
+                ctx.json(p.getDataService().getAllCasesNames());
+            }
         });
 
         app.post("case", ctx -> {

src/main/java/de/isuret/polos/AetherOnePi/service/DataService.java

@@ -14,6 +14,7 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.StoredConfig;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import processing.data.Sort;
 
 import java.io.File;
 import java.io.IOException;
@@ -186,6 +187,23 @@ public void saveCase(Case caseObject) throws IOException {
         mapper.writeValue(new File("cases/" + caseObject.getName().replaceAll(" ","") + ".json"), caseObject);
     }
 
+    public List<String> getAllCasesNames() {
+        File dir = new File("cases");
+        List<String> names = new ArrayList<>();
+        for (File file : Objects.requireNonNull(dir.listFiles())) {
+            if (file.isFile() && file.getName().endsWith(".json") && !file.getName().contains("dashboardInformations")) {
+                names.add(file.getName().replace(".json",""));
+            }
+        }
+        names.sort(Comparator.comparing(String::toLowerCase));
+        return names;
+    }
+
+    public Case loadCase(String caseName) throws IOException {
+        File caseFile = new File("cases/" + caseName + ".json");
+        return loadCase(caseFile);
+    }
+
     public Case loadCase(File caseFile) throws IOException {
 
         if (!caseFile.exists()) {

src/main/ui/src/app/app-routing.module.ts

@@ -7,10 +7,12 @@ import {BroadcastComponent} from "./components/broadcast/broadcast.component";
 import {HttpClientModule} from "@angular/common/http";
 import {WeaverComponent} from "./components/weaver/weaver.component";
 import {MapComponent} from "./components/map/map.component";
+import {CasesComponent} from "./components/cases/cases.component";
 
 const routes: Routes = [
   {path: '', redirectTo: 'HOME', pathMatch: 'full'},
   {path: 'HOME', component: HomeComponent},
+  {path: 'CASES', component: CasesComponent},
   {path: 'ANALYSIS', component: AnalysisComponent},
   {path: 'MAP', component: MapComponent},
   {path: 'WEAVER', component: WeaverComponent},

src/main/ui/src/app/app.module.ts

@@ -14,6 +14,7 @@ import { MapComponent } from './components/map/map.component';
 import {allIcons, NgxBootstrapIconsModule} from "ngx-bootstrap-icons";
 import {ToastrModule} from "ngx-toastr";
 import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
+import { CasesComponent } from './components/cases/cases.component';
 
 @NgModule({
   declarations: [
@@ -23,7 +24,8 @@ import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
     SettingsComponent,
     BroadcastComponent,
     WeaverComponent,
-    MapComponent
+    MapComponent,
+    CasesComponent
   ],
     imports: [
         BrowserModule,

src/main/ui/src/app/components/app/app.component.ts

@@ -45,6 +45,7 @@ export class AppComponent {
 
   private initLinks() {
     this.addLink("HOME", true, "#f88b00");
+    this.addLink("CASES", false, "#10a4d1");
     this.addLink("ANALYSIS", false, "#c410d1");
     this.addLink("MAP", false, "#21a103");
     this.addLink("WEAVER", false, "#10d1b1");

src/main/ui/src/app/components/cases/cases.component.html

@@ -0,0 +1,64 @@
+<div *ngIf="caseObject">
+  <h1>{{caseObject.name}}</h1>
+  <b>Created {{caseObject.created | date:"MMM dd, yyyy 'at' hh:mm a"}}</b>
+  <hr>
+  <p>{{caseObject.description}}</p>
+  <button *ngFor="let session of caseObject.sessionList" class="btn btn-sm btn-outline-light" style="margin-left: 0.2rem" [class.noAnalysis]="!session.analysisResult"
+          (click)="selectedSession = session">{{session.created | date:"MMM dd, yyyy 'at' hh:mm a"}} {{session.intenion}} {{session.description}}</button>
+
+  <div *ngIf="selectedSession && selectedSession.analysisResult">
+    <hr>
+    <button class="btn btn-danger btn-sm" (click)="selectedSession = undefined">Close Session</button>
+    <table class="table table-sm table-striped table-hover">
+      <thead>
+      <tr>
+        <th>NO</th>
+        <th>EV</th>
+        <th>RATE/SIGNATURE</th>
+        <th>POTENCY</th>
+        <th>LEVEL</th>
+        <th>HIT</th>
+        <th>GV</th>
+        <th>GV RE</th>
+        <th>REC</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr *ngFor="let r of selectedSession.analysisResult.rateObjects; index as i"
+          [class.currentGvRow]="i == selectedSession.analysisResult.generalVitality"
+          [class.hitGvRow]="r.gv > 999 && r.gv >= selectedSession.analysisResult.generalVitality"
+          [class.greenGvRow]="r.gv > 999 && r.gv < selectedSession.analysisResult.generalVitality">
+        <td>{{i + 1}}</td>
+        <td>{{r.energeticValue}}</td>
+        <td *ngIf="r.url"><a href="{{r.url}}" target="{{r.nameOrRate}}">{{r.nameOrRate}}</a></td>
+        <td *ngIf="!r.url">{{r.nameOrRate}}</td>
+        <td>{{r.potency}}</td>
+        <td>{{r.level}}</td>
+        <td></td>
+        <td>{{r.gv}}</td>
+        <td>{{r.recurringGeneralVitality}}</td>
+        <td>{{r.recurring}}</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<table class="table table-sm table-striped table-hover">
+  <thead>
+  <tr>
+    <th>NAME</th>
+    <th>ACTIONS</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr *ngFor="let c of caseNames">
+    <td>
+      <button class="btn btn-sm btn-success" (click)="openCase(c)">{{c}}</button>
+    </td>
+    <td>
+      <button class="btn btn-sm btn-danger" (click)="deletCase(c)">X</button>
+    </td>
+  </tr>
+  </tbody>
+</table>

src/main/ui/src/app/components/cases/cases.component.scss

@@ -0,0 +1,3 @@
+.noAnalysis {
+  background-color: #482828;
+}

src/main/ui/src/app/components/cases/cases.component.ts

@@ -0,0 +1,37 @@
+import { Component, OnInit } from '@angular/core';
+import {AetherOnePiService} from "../../services/aether-one-pi.service";
+import {Case, Session} from "../../domains/Case";
+import {DatePipe} from "@angular/common";
+
+@Component({
+  selector: 'app-cases',
+  templateUrl: './cases.component.html',
+  styleUrls: ['./cases.component.scss']
+})
+export class CasesComponent implements OnInit {
+
+  caseObject:Case|undefined;
+  selectedSession:Session|undefined;
+  caseNames:string[] = []
+  constructor(private aetherOnePiService:AetherOnePiService) { }
+
+  ngOnInit(): void {
+    this.aetherOnePiService.getAllCases().subscribe( c => this.caseNames = c)
+  }
+
+  openCase(c: string) {
+    this.aetherOnePiService.loadCase(c).subscribe( caseObject => {
+      this.caseObject = caseObject
+    })
+  }
+
+  deletCase(c: string) {
+
+  }
+
+  protected readonly DatePipe = DatePipe;
+
+  getCollapseInnerHtml(session: Session, i: number):string {
+    return `<h4 class="collapseHeader" data-bs-toggle="collapse" href="#session${i}" role="button" aria-expanded="false" aria-controls="session${i}>${session.created}</h4>`
+  }
+}

src/main/ui/src/app/components/home/home.component.html

@@ -1,4 +1,5 @@
 <p>Welcome to the UI of AetherOnePi!</p>
+<p>The UI is served by the AetherOnPi (which is your personal server on your computer). It enhances the functionality with an easier user interface, enabling more functionality suited for professional use.</p>
 <p>This design will change a lot during development. You can contribute with you ideas, suggestions and bug reports!</p>
 <hr>
 <a href="patreon.com/aetherone" target="patreonIsuretPolos" class="btn btn-success btn-sm">Support me on PATREON!<br>And get FREE courses for radionics and homeopathy!</a>

src/main/ui/src/app/services/aether-one-pi.service.ts

@@ -49,8 +49,16 @@ export class AetherOnePiService {
     return this.http.get<string[]>(`${this.baseUrl}rates`);
   }
 
+  getAllCases():Observable<string[]> {
+    return this.http.get<string[]>(`${this.baseUrl}case`);
+  }
+
+  loadCase(caseName:string):Observable<Case> {
+    return this.http.get<Case>(`${this.baseUrl}case?name=${caseName}`);
+  }
+
   getCase():Observable<Case> {
-    return this.http.get<Case>(`${this.baseUrl}case`);
+    return this.http.get<Case>(`${this.baseUrl}case/current`);
   }
 
   saveCase(caseObject:Case):Observable<void> {