Update dvza service

dvzaservice/app/src/App.js

@@ -1,6 +1,7 @@
 import React from "react";
 import {
   Link,
+  NavLink,
   Outlet,
 } from "react-router-dom";
 import "./Index.css";
@@ -8,9 +9,11 @@ const App = () => {
   return (
     <div>
         <nav className="c-main-nav">
-            <p style={{padding: 5, marginRight: 50}}>ACME DVZA</p>
-            <Link to="connecties">Connecties</Link>
-            <Link to="registraties">Registraties</Link>
+            <p style={{marginRight: 50}}><Link to="/">DVZA</Link></p>
+            <div className="c-main-nav__main">
+              <NavLink to="connecties">Verbindingen</NavLink>
+              <NavLink to="registraties">Registratieverzoeken</NavLink>
+            </div>
         </nav>
         <div className="c-main-content">
               <Outlet/>

dvzaservice/app/src/Connection.js

@@ -44,6 +44,7 @@ const Connection = () => {
     console.log('service', service)
     return (
         <div>
+            <h1 className="t-page-header">Verbinding</h1>
             {(connection && service) ? (<h2>{connection.OrganisationDisplayName} ({connection.OrganisationId}) | {service.Service.Name}</h2>) : null}
             {<Subscriptions service={service}/>}
         </div>

dvzaservice/app/src/Connections.js

@@ -3,6 +3,11 @@ import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import "./Index.css";
 
+const subscriptionsCount = (s) => {
+    const l = s.Subscriptions.length
+    return l == 1 ? "1 patiënt aangemeld" : `${l} patiënten aangemeld`
+}
+
 const App = () => {
     const [connections, setConnections] = useState([])
     useEffect(() => {
@@ -10,6 +15,7 @@ const App = () => {
     }, [])
     return (
         <div>
+            <h1 className="t-page-header">Verbindingen</h1>
             <table className="c-table">
                 <thead>
                     <tr>
@@ -24,7 +30,7 @@ const App = () => {
                         <td>{x.OrganisationId}</td>
                         <td>{x.OrganisationDisplayName}</td>
                         <td>{x.Services.length ? x.Services.map((s) => {
-                            return <span key={s.Service.ID} style={{marginRight: 10}}><Link to={`/connecties/${x.ID}/${s.ID}`} >{s.Service.Name}</Link></span>
+                            return <span key={s.Service.ID} style={{marginRight: 10}}><Link to={`/connecties/${x.ID}/${s.ID}`} >{s.Service.Name} ({subscriptionsCount(s)})</Link></span>
                         }) : '-'}</td>
                     </tr>)
                 })}

dvzaservice/app/src/Home.js

@@ -3,7 +3,10 @@ import "./Index.css";
 
 const App = () => {
   return (
-    <div></div>
+    <div>
+        <h1 className="t-page-header">Welkom bij DVZA</h1>
+        <p>Dit systeem is beschikbaar op: <code>dvza.openkv.mcsr.nl:9999</code></p>
+    </div>
   );
 };
 

dvzaservice/app/src/Index.css

@@ -1,5 +1,5 @@
 body {
-	font-family: helvetica;
+	font-family: Helvetica, Arial, sans-serif;
 }
 
 * { margin: 0; padding: 0; box-sizing: border-box; }
@@ -8,6 +8,12 @@ h2 {
 	margin-bottom: 35px;
 }
 
+code {
+    font-size: 120%;
+    background: rgba(0,0,0,0.1);
+    padding: 10px;
+}
+
 .c-main-nav {
 	padding: 15px;
 	display: flex;
@@ -16,8 +22,20 @@ h2 {
 	box-shadow: 2px 2px 10px rgba(0,0,0,0.1);
 }
 
+.c-main-nav__main {
+	display: flex;
+	justify-content: space-between;
+    flex:1;
+}
+
 .c-main-nav a {display: block; padding: 5px; color: #137ad4; text-decoration: none}
 
+.c-main-nav p a {color: black}
+.c-main-nav .active {font-weight:bold; text-decoration: underline}
+.t-page-header {
+	margin-bottom: 50px;
+}
+
 .c-table {
 	width: 100%;
 }

dvzaservice/app/src/Patient.js

@@ -14,6 +14,7 @@ const Patient = () => {
 
     return (
         <div>
+            <h1 className="t-page-header">Patient</h1>
            {patient ? <JSONPretty id="json-pretty"  theme={JSONPrettyMon} data={patient}></JSONPretty> : null}
         </div>
     );

dvzaservice/app/src/Registrations.js

@@ -10,6 +10,7 @@ const App = () => {
     console.log('registrations', registrations)
     return (
         <div>
+            <h1 className="t-page-header">Registratie verzoeken</h1>
             <table className="c-table">
                 <tr>
                     <th>AGB</th>

dvzaservice/main.go

@@ -12,8 +12,8 @@ import (
 	"whiteboxsystems.nl/openkvpoc/openkv"
 )
 
-var srvaddr = "localhost:9999"
-var patientIf = "localhost:9095"
+var rpcAddr = "0.0.0.0:9999"
+var uiAddr = "0.0.0.0:9095"
 
 func main() {
 	stop := make(chan os.Signal, 1)
@@ -29,18 +29,18 @@ func main() {
 	grpcServer := grpc.NewServer(opts...)
 
 	go func() {
-		lis, err := net.Listen("tcp", srvaddr)
+		lis, err := net.Listen("tcp", rpcAddr)
 		if err != nil {
 			log.Fatalf("failed to listen: %v", err)
 		}
 
 		openkv.RegisterOpenKVServer(grpcServer, openapisrv)
-		log.Printf("RPC Listening on %v", srvaddr)
+		log.Printf("RPC Listening on %v", rpcAddr)
 		wg.Add(1)
 		grpcServer.Serve(lis)
 	}()
 
-	srv := NewUIServer(patientIf)
+	srv := NewUIServer(uiAddr)
 	srv.data = openapisrv.data
 
 	go func() {

dvzaservice/srv.go

@@ -131,7 +131,7 @@ func (srv *UIService) Authenticate(c *gin.Context) {
 
 func (srv *UIService) GetConnections(c *gin.Context) {
 	connections := []*sharedmodel.Connection{}
-	srv.data.Preload("Services").Preload("Services.Service").Find(&connections)
+	srv.data.Preload("Services").Preload("Services.Service").Preload("Services.Subscriptions").Find(&connections)
 	c.JSON(200, connections)
 }
 

dvzaservice/templates/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>ACME - DVZA</title>
+    <title>DVZA</title>
 </head>
 <body>
     <div id="root"></div>