Compare commits
8 Commits
952c8561ba
...
wip-debug-
Author | SHA1 | Date | |
---|---|---|---|
571da52888 | |||
c462442221
|
|||
27d63f467c | |||
078523ebad | |||
ec1e147e91
|
|||
9c1e06915e
|
|||
7a22503bac
|
|||
5645f6ab71
|
@ -1,28 +0,0 @@
|
|||||||
name: Demande de fusion (Pull Request)
|
|
||||||
about: Créez une demande de fusion pour partager votre travail avec le reste de l'équipe
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Une demande de fusion (Pull Request) a pour objectif de
|
|
||||||
partager au reste de l'équipe un développement réalisé.
|
|
||||||
Décrire les modifications apportées, leur impact et le contexte
|
|
||||||
dans lequel elles ont été réalisées permettra aux relecteurices
|
|
||||||
de plus facilement comprendre et valider votre travail.
|
|
||||||
- type: textarea
|
|
||||||
id: details
|
|
||||||
attributes:
|
|
||||||
label: Détails
|
|
||||||
description: Décrivez le contenu de la PR, son impact concret
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: why
|
|
||||||
attributes:
|
|
||||||
label: Pourquoi ?
|
|
||||||
description: Pourquoi ces modifications sont elles nécessaires ? Dans quel contexte s'inscrivent-elles ?
|
|
||||||
- type: textarea
|
|
||||||
id: documentation
|
|
||||||
attributes:
|
|
||||||
label: Documentation
|
|
||||||
description: Précisez ici des références à des ressources que vous avez utilisées pour réaliser ces modifications
|
|
@ -1,29 +0,0 @@
|
|||||||
name: Rapport de bug
|
|
||||||
about: Remplissez un rapport d'erreur
|
|
||||||
title: "[Bug]: "
|
|
||||||
blank_issues_enabled: false
|
|
||||||
labels:
|
|
||||||
- bug
|
|
||||||
- to-triage
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: what-happened
|
|
||||||
attributes:
|
|
||||||
label: Que se passe-t-il ?
|
|
||||||
description: Décrivez la situation que vous rencontrez
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: environment-description
|
|
||||||
attributes:
|
|
||||||
label: Si le problème semble lié à votre environement, décrivez-le ici
|
|
||||||
placeholder: Windows 10, Firefox 89.0, etc.
|
|
||||||
- type: dropdown
|
|
||||||
id: module
|
|
||||||
attributes:
|
|
||||||
label: Ce problème est il relatif à un ou des modules en particulier ?
|
|
||||||
multiple: true
|
|
||||||
options:
|
|
||||||
- Clego
|
|
||||||
- Tauri
|
|
||||||
- Axum
|
|
@ -1,13 +0,0 @@
|
|||||||
name: Proposez une fonctionnalité / amélioration
|
|
||||||
about: Proposez vos idées de fonctionnalités ou d'améliorations
|
|
||||||
blank_issues_enabled: false
|
|
||||||
labels:
|
|
||||||
- feature
|
|
||||||
- to-triage
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: description
|
|
||||||
attributes:
|
|
||||||
label: Décrivez votre idée
|
|
||||||
validations:
|
|
||||||
required: true
|
|
@ -1,20 +0,0 @@
|
|||||||
name: Posez une question
|
|
||||||
about: Une interrogation, une difficulté ? Posez votre question
|
|
||||||
blank_issues_enabled: false
|
|
||||||
labels:
|
|
||||||
- question
|
|
||||||
- to-triage
|
|
||||||
body:
|
|
||||||
- type: textarea
|
|
||||||
id: question
|
|
||||||
attributes:
|
|
||||||
label: Que se passe-t-il ?
|
|
||||||
description: Décrivez la situation que vous rencontrez, posez votre question
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: environment-description
|
|
||||||
attributes:
|
|
||||||
label: Précisez votre environnement
|
|
||||||
description: S'il vous semble pertinent de préciser votre environement, décrivez-le ici
|
|
||||||
placeholder: Windows 10, Firefox 89.0, etc.
|
|
27
.gitignore
vendored
@ -1,23 +1,6 @@
|
|||||||
# ---> Rust
|
# Ignore Rust target directory
|
||||||
# Generated by Cargo
|
/target
|
||||||
# will have compiled files and executables
|
|
||||||
debug/
|
|
||||||
target/
|
|
||||||
|
|
||||||
# These are backup files generated by rustfmt
|
|
||||||
**/*.rs.bk
|
|
||||||
|
|
||||||
# MSVC Windows builds of rustc generate these, which store debugging information
|
|
||||||
*.pdb
|
|
||||||
|
|
||||||
# Editor directories and files
|
|
||||||
.vscode/*
|
|
||||||
!.vscode/extensions.json
|
|
||||||
.idea
|
|
||||||
.DS_Store
|
|
||||||
*.suo
|
|
||||||
*.ntvs*
|
|
||||||
*.njsproj
|
|
||||||
*.sln
|
|
||||||
*.sw?
|
|
||||||
|
|
||||||
|
# Ignore .env files
|
||||||
|
.env
|
||||||
|
.env.build
|
4749
Cargo.lock
generated
20
Cargo.toml
@ -1,8 +1,12 @@
|
|||||||
[workspace]
|
[package]
|
||||||
resolver = "2"
|
name = "utils-debug-c-lib"
|
||||||
members = [
|
version = "0.1.0"
|
||||||
"crates/app",
|
edition = "2021"
|
||||||
"crates/sesam-vitale",
|
build = "build.rs"
|
||||||
"crates/desktop",
|
|
||||||
"crates/services-sesam-vitale-sys",
|
[dependencies]
|
||||||
]
|
dotenv = "0.15"
|
||||||
|
libc = "0.2"
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
dotenv = "0.15"
|
||||||
|
86
README.md
@ -1,56 +1,46 @@
|
|||||||
# Krys4lide
|
## Requirements
|
||||||
|
|
||||||
Logiciel de Pharmacie libre et open-source.
|
- Installer le [package FSV](https://industriels.sesam-vitale.fr/group/fournitures-sesam-vitale)
|
||||||
|
- Les librairies dynamiques (.lib, .dll, ...) fournies ne sont pas installés dans les emplacements standard du système, il faudra donc configurer leur chemin d'installation dans le fichier de configuration `.env.build` (voir ci-dessous)
|
||||||
|
- Le détail des chemins d'installation est donné dans la documentation du package FSV `fsv-mi-004_pack-FSV1.40.14_V2.3.pdf`
|
||||||
|
- Linux - par défaut : `/opt/santesocial/fsv/1.40.13/lib`
|
||||||
|
- Windows - par défaut : `C:\Program Files\santesocial\santesocial\fsv\1.40.14\lib` (ou dans Program Files (x86) si c'est le package 32bits qui a été installé)
|
||||||
|
|
||||||
## Crates
|
- Installer la [CryptolibCPS](https://industriels.sesam-vitale.fr/group/galss-cryptolib-cps)
|
||||||
|
- Ce package fourni également l'utilitaire "CPS Gestion" pour obtenir des informations sur le lecteur de carte, etc.
|
||||||
|
- Linux : `cpgeslux`
|
||||||
|
- Windows : `...`
|
||||||
|
|
||||||
- `app`: Interface du logiciel, servie par un serveur web propulsé par Axum. Utilisable en mode endpoint ou encapsulé dans le client `desktop`
|
## Setup
|
||||||
- `desktop`: Client desktop propulsé par Tauri, encapsulant le serveur web `app`
|
|
||||||
- `sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
|
|
||||||
|
|
||||||
## Development
|
- Créer et éditer le fichier de configuration de build `.env.build` en s'inspirant d'un des fichiers d'exemple (`.env.build.linux.example`, `.env.build.win.example`...)
|
||||||
|
- Ce fichier est nécessaire pour le build du package Rust
|
||||||
### Pré-requis
|
- Créer et éditer le fichier de configuration de l'exécution `.env` en s'inspirant d'un des fichiers d'exemple (`.env.linux.example`, `.env.win.example`...)
|
||||||
|
- Ce fichier est nécessaire pour l'exécution du package Rust compilé, et doit donc être présent aux côtés de l'exécutable généré, le cas échéant
|
||||||
#### Tauri CLI
|
|
||||||
|
|
||||||
La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être installée via Cargo :
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cargo install tauri-cli --version "^2.0.0-beta"
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Tailwindcss CLI
|
|
||||||
|
|
||||||
Le CLI Tailwindcss est nécessaire pour la génération du fichier `crates/app/assets/css/style.css`.
|
|
||||||
|
|
||||||
La documentation d'installation est disponible sur le site officiel de Tailwindcss : https://tailwindcss.com/blog/standalone-cli
|
|
||||||
|
|
||||||
La version actuellement utilisée est la [`v3.4.7`](https://github.com/tailwindlabs/tailwindcss/releases/tag/v3.4.7)
|
|
||||||
|
|
||||||
#### SESAM-Vitale
|
|
||||||
|
|
||||||
La crate `sesam-vitale` nécessite la présence des librairies dynamiques fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `sesam-vitale`.
|
|
||||||
|
|
||||||
### Lancement
|
|
||||||
|
|
||||||
Le logiciel dans sa globalité peut être lancé via la commande suivante :
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cargo tauri dev
|
|
||||||
```
|
|
||||||
|
|
||||||
/!\ Attention, le lancement du client `desktop` ne génère pas le fichier `crates/app/assets/css/style.css` automatiquement pour le moment. En cas de modification des interfaces web, il est donc nécessaire de procéder à sa génération comme indiqué dans le [README](crates/app/README.md) de la crate `app`.
|
|
||||||
|
|
||||||
Si vous souhaitez lancer les composants séparément, les indications de lancement sont disponibles dans les README des différents crates.
|
|
||||||
|
|
||||||
- [app](crates/app/README.md)
|
|
||||||
- [sesam-vitale](crates/sesam-vitale/README.md)
|
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
Packager le client desktop
|
### Compilation C
|
||||||
|
|
||||||
```bash
|
Ce package s'appuie sur deux librairies :
|
||||||
cargo tauri build
|
- Une librairie statique, compilée à partir des sources (`*.c`, `*.h`) fournies dans le dossier `./src`
|
||||||
```
|
- Une librairie dynamique, fournie par le package FSV
|
||||||
|
- Windows : on fournit les headers, non présents dans la `.dll` en compilant les fichiers `src/*.def` en leur version binaire `lib/*.lib`
|
||||||
|
|
||||||
|
Pour compiler les fichiers de librairie :
|
||||||
|
|
||||||
|
- Windows : `.\make.bat`
|
||||||
|
- Linux : `make`
|
||||||
|
|
||||||
|
Pour nettoyer le dossier `./lib` :
|
||||||
|
|
||||||
|
- Windows : `.\make.bat /clean`
|
||||||
|
- Linux : `make clean`
|
||||||
|
|
||||||
|
### Compilation Rust
|
||||||
|
|
||||||
|
`cargo build`
|
||||||
|
|
||||||
|
## Run
|
||||||
|
|
||||||
|
`cargo run`
|
||||||
|
@ -4,33 +4,23 @@ use std::env;
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
// Load the .env.build file for build-time environment variables
|
dotenv::from_filename(".env.build").ok();
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
|
||||||
let manifest_path = PathBuf::from(manifest_dir);
|
|
||||||
dotenv::from_path(manifest_path.join(".env.build")).ok();
|
|
||||||
|
|
||||||
println!("cargo::rerun-if-env-changed=SESAM_FSV_LIB_PATH");
|
|
||||||
println!("cargo::rerun-if-env-changed=SESAM_FSV_SSVLIB");
|
|
||||||
println!("cargo::rerun-if-changed=.env.build");
|
println!("cargo::rerun-if-changed=.env.build");
|
||||||
println!("cargo::rerun-if-changed=build.rs");
|
|
||||||
|
|
||||||
// Add local lib directory to the linker search path (for def files and static libs)
|
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
||||||
let static_lib_path = manifest_path.join("lib");
|
|
||||||
|
let static_lib_path = PathBuf::from(manifest_dir).join("lib");
|
||||||
println!("cargo::rustc-link-search=native={}", static_lib_path.display());
|
println!("cargo::rustc-link-search=native={}", static_lib_path.display());
|
||||||
|
println!("cargo::rustc-link-lib=static=p4pillondebuglib");
|
||||||
|
|
||||||
// Add the SESAM_FSV_LIB_PATH to the linker search path
|
|
||||||
let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
|
let fsv_lib_path = PathBuf::from(env::var("SESAM_FSV_LIB_PATH").unwrap());
|
||||||
println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
|
println!("cargo::rustc-link-search=native={}", fsv_lib_path.display());
|
||||||
|
println!("cargo::rustc-link-lib=dylib={}", env::var("SESAM_FSV_SSVLIB").unwrap());
|
||||||
|
|
||||||
// Add the SESAM_FSV_LIB_PATH to the PATH environment variable
|
|
||||||
if cfg!(target_os = "windows") {
|
if cfg!(target_os = "windows") {
|
||||||
let path = env::var("PATH").unwrap_or(String::new());
|
let path = env::var("PATH").unwrap_or(String::new());
|
||||||
println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
|
println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path);
|
||||||
} else if cfg!(target_os = "linux") {
|
} else if cfg!(target_os = "linux") {
|
||||||
println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
|
println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Link the SESAM_FSV_SSVLIB dynamic library
|
|
||||||
println!("cargo::rustc-link-lib=dylib={}", env::var("SESAM_FSV_SSVLIB").unwrap());
|
|
||||||
// TODO : try `raw-dylib` instead of `dylib` on Windows to avoid the need of the `lib` headers compiled from the `def`
|
|
||||||
}
|
}
|
4
crates/app/.gitignore
vendored
@ -1,4 +0,0 @@
|
|||||||
/target
|
|
||||||
|
|
||||||
# Tailwind CSS CLI
|
|
||||||
tailwindcss
|
|
@ -1,13 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "app"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
askama = "0.12.1"
|
|
||||||
askama_axum = "0.4.0"
|
|
||||||
axum = "0.7.5"
|
|
||||||
serde = { version = "1.0.204", features = ["derive"] }
|
|
||||||
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
|
||||||
tower-http = { version = "0.5.2", features = ["fs"] }
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
|||||||
## Pré-requis
|
|
||||||
|
|
||||||
- Récupérer le binaire TailwindCSS : https://tailwindcss.com/blog/standalone-cli
|
|
||||||
|
|
||||||
## Exécution
|
|
||||||
|
|
||||||
- Lancer tailwindcss en mode watch dans un terminal :
|
|
||||||
```bash
|
|
||||||
./tailwindcss -i css/input.css -o assets/css/style.css --watch
|
|
||||||
```
|
|
||||||
|
|
||||||
- Lancer le serveur web dans un autre terminal :
|
|
||||||
```bash
|
|
||||||
cargo run --bin app
|
|
||||||
```
|
|
1
crates/app/assets/css/flowbite@2.5.1.min.css
vendored
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
@ -1,3 +0,0 @@
|
|||||||
@tailwind base;
|
|
||||||
@tailwind components;
|
|
||||||
@tailwind utilities;
|
|
@ -1,30 +0,0 @@
|
|||||||
mod pages;
|
|
||||||
mod templates;
|
|
||||||
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use askama::Template;
|
|
||||||
use askama_axum::IntoResponse;
|
|
||||||
use axum::http::{StatusCode, Uri};
|
|
||||||
use tower_http::services::ServeDir;
|
|
||||||
|
|
||||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
|
||||||
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "index.html")]
|
|
||||||
pub struct GetIndexResponse;
|
|
||||||
|
|
||||||
async fn root() -> impl IntoResponse {
|
|
||||||
GetIndexResponse {}.into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_router(assets_path: &Path) -> axum::Router {
|
|
||||||
axum::Router::new()
|
|
||||||
.nest_service("/assets", ServeDir::new(assets_path))
|
|
||||||
.route("/", axum::routing::get(root))
|
|
||||||
.nest("/pages", pages::get_routes())
|
|
||||||
.merge(templates::get_routes())
|
|
||||||
.fallback(fallback)
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
use ::app::get_router;
|
|
||||||
use std::env;
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() {
|
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
|
||||||
let assets_path = Path::new(&manifest_dir).join("assets");
|
|
||||||
let router = get_router(assets_path.as_path());
|
|
||||||
|
|
||||||
// TODO: select port based on available port (or ask in CLI)
|
|
||||||
let listener = tokio::net::TcpListener::bind("localhost:3000").await.unwrap();
|
|
||||||
println!("Listening on: http://{}", listener.local_addr().unwrap());
|
|
||||||
axum::serve(listener, router).await.unwrap();
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
use askama::Template;
|
|
||||||
use askama_axum::IntoResponse;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "pages/cps.html")]
|
|
||||||
struct CpsResponse;
|
|
||||||
|
|
||||||
pub async fn cps() -> impl IntoResponse {
|
|
||||||
CpsResponse.into_response()
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
use askama::Template;
|
|
||||||
use askama_axum::IntoResponse;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "pages/home.html")]
|
|
||||||
struct HomeResponse;
|
|
||||||
|
|
||||||
pub async fn home() -> impl IntoResponse {
|
|
||||||
HomeResponse.into_response()
|
|
||||||
}
|
|
@ -1,10 +0,0 @@
|
|||||||
use axum::{routing, Router};
|
|
||||||
|
|
||||||
mod cps;
|
|
||||||
mod home;
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router {
|
|
||||||
Router::new()
|
|
||||||
.route("/home", routing::get(home::home))
|
|
||||||
.route("/cps", routing::get(cps::cps))
|
|
||||||
}
|
|
@ -1,20 +0,0 @@
|
|||||||
use askama::Template;
|
|
||||||
use askama_axum::IntoResponse;
|
|
||||||
use axum::{routing, Router};
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "hello.html")]
|
|
||||||
struct HelloResponse {
|
|
||||||
pub name: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn hello() -> impl IntoResponse {
|
|
||||||
HelloResponse {
|
|
||||||
name: "Theo".to_string(),
|
|
||||||
}.into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router {
|
|
||||||
Router::new()
|
|
||||||
.route("/", routing::get(hello))
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
use axum::Router;
|
|
||||||
|
|
||||||
mod hello;
|
|
||||||
mod nav;
|
|
||||||
mod profile;
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router {
|
|
||||||
Router::new()
|
|
||||||
.nest("/hello", hello::get_routes())
|
|
||||||
.nest("/nav", nav::get_routes())
|
|
||||||
.nest("/profile", profile::get_routes())
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
use askama::Template;
|
|
||||||
use askama_axum::IntoResponse;
|
|
||||||
use axum::{extract::Query, routing, Router};
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
struct MenuItem {
|
|
||||||
label: String,
|
|
||||||
href: String,
|
|
||||||
current: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct MenuParameters {
|
|
||||||
mobile: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "layout/nav/nav-menu-items.html")]
|
|
||||||
struct MenuResponse {
|
|
||||||
mobile: bool,
|
|
||||||
items: Vec<MenuItem>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MenuResponse {
|
|
||||||
fn get_classes(&self, is_current_item: &bool) -> String {
|
|
||||||
let common_classes = match self.mobile {
|
|
||||||
true => "block border-l-4 py-2 pl-3 pr-4 text-base font-medium".to_string(),
|
|
||||||
false => "inline-flex items-center border-b-2 px-1 pt-1 text-sm font-medium".to_string(),
|
|
||||||
};
|
|
||||||
match (self.mobile, is_current_item) {
|
|
||||||
(true, true) => common_classes + " border-indigo-500 bg-indigo-50 text-indigo-700",
|
|
||||||
(true, false) => common_classes + " border-transparent text-gray-600 hover:border-gray-300 hover:bg-gray-50 hover:text-gray-800",
|
|
||||||
(false, true) => common_classes + " border-indigo-500 text-gray-900",
|
|
||||||
(false, false) => common_classes + " border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn menu(Query(params): Query<MenuParameters>) -> impl IntoResponse {
|
|
||||||
MenuResponse {
|
|
||||||
mobile: params.mobile,
|
|
||||||
items: vec![
|
|
||||||
MenuItem {
|
|
||||||
label: "Accueil".to_string(),
|
|
||||||
href: "/pages/home".to_string(),
|
|
||||||
current: true,
|
|
||||||
},
|
|
||||||
MenuItem {
|
|
||||||
label: "CPS".to_string(),
|
|
||||||
href: "/pages/cps".to_string(),
|
|
||||||
current: false,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}.into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router {
|
|
||||||
Router::new()
|
|
||||||
.route("/menu", routing::get(menu))
|
|
||||||
}
|
|
@ -1,65 +0,0 @@
|
|||||||
use askama::Template;
|
|
||||||
use askama_axum::IntoResponse;
|
|
||||||
use axum::{extract::Query, routing, Router};
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
struct MenuItem {
|
|
||||||
label: String,
|
|
||||||
id: String,
|
|
||||||
current: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct MenuParameters {
|
|
||||||
mobile: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "layout/nav/profile-menu-items.html")]
|
|
||||||
struct MenuResponse {
|
|
||||||
mobile: bool,
|
|
||||||
items: Vec<MenuItem>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MenuResponse {
|
|
||||||
fn get_classes(&self, is_current_item: &bool) -> String {
|
|
||||||
let common_classes = match self.mobile {
|
|
||||||
true => "block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800".to_string(),
|
|
||||||
false => "block px-4 py-2 text-sm text-gray-700".to_string(),
|
|
||||||
};
|
|
||||||
match (self.mobile, is_current_item) {
|
|
||||||
(true, true) => common_classes + "", // ???
|
|
||||||
(true, false) => common_classes + "",
|
|
||||||
(false, true) => common_classes + " bg-gray-100",
|
|
||||||
(false, false) => common_classes + "",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn menu(Query(params): Query<MenuParameters>) -> impl IntoResponse {
|
|
||||||
MenuResponse {
|
|
||||||
mobile: params.mobile,
|
|
||||||
items: vec![
|
|
||||||
MenuItem {
|
|
||||||
label: "Votre profil".to_string(),
|
|
||||||
id: "profile".to_string(),
|
|
||||||
current: false,
|
|
||||||
},
|
|
||||||
MenuItem {
|
|
||||||
label: "Paramètres".to_string(),
|
|
||||||
id: "settings".to_string(),
|
|
||||||
current: false,
|
|
||||||
},
|
|
||||||
MenuItem {
|
|
||||||
label: "Déconnexion".to_string(),
|
|
||||||
id: "logout".to_string(),
|
|
||||||
current: false,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}.into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router {
|
|
||||||
Router::new()
|
|
||||||
.route("/menu", routing::get(menu))
|
|
||||||
}
|
|
@ -1,12 +0,0 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
|
||||||
module.exports = {
|
|
||||||
content: [
|
|
||||||
'./templates/**/*.html',
|
|
||||||
'./css/**/*.css',
|
|
||||||
],
|
|
||||||
theme: {
|
|
||||||
extend: {},
|
|
||||||
},
|
|
||||||
plugins: [],
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="fr" class="h-full">
|
|
||||||
<head>
|
|
||||||
<title>{% block title %}{{ title }}{% endblock %}</title>
|
|
||||||
|
|
||||||
<script src="/assets/js/htmx@2.0.1.min.js"></script>
|
|
||||||
<script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
|
|
||||||
<link href="/assets/css/style.css" rel="stylesheet">
|
|
||||||
<link href="/assets/css/flowbite@2.5.1.min.css" rel="stylesheet" />
|
|
||||||
<script src="/assets/js/flowbite@2.5.1.min.js"></script>
|
|
||||||
|
|
||||||
{% block head %}{% endblock %}
|
|
||||||
</head>
|
|
||||||
<body class="h-full">
|
|
||||||
<div class="min-h-full">
|
|
||||||
{% block nav %}
|
|
||||||
{% include "layout/nav.html" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block body %}{% endblock %}
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
@ -1 +0,0 @@
|
|||||||
<div>Hello {{name}}!</div>
|
|
@ -1,34 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block title %}Pharma Libre{% endblock %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
<div class="py-10">
|
|
||||||
<header>
|
|
||||||
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
|
||||||
<h1
|
|
||||||
id="page-title"
|
|
||||||
class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
|
|
||||||
>
|
|
||||||
{% include "skeletons/page-title.html" %}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<main>
|
|
||||||
<div
|
|
||||||
id="main-container"
|
|
||||||
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
|
||||||
>
|
|
||||||
<!-- Your content -->
|
|
||||||
<div
|
|
||||||
hx-get="/pages/home"
|
|
||||||
hx-target="this"
|
|
||||||
hx-trigger="load"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
{% include "skeletons/card.html" %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
@ -1,41 +0,0 @@
|
|||||||
<nav
|
|
||||||
class="border-b border-gray-200 bg-white"
|
|
||||||
x-data="{ menuOpen: false }"
|
|
||||||
>
|
|
||||||
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
|
||||||
<div class="flex h-16 justify-between">
|
|
||||||
<div class="flex">
|
|
||||||
{% include "layout/nav/logo.html" %}
|
|
||||||
<div class="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">
|
|
||||||
{% include "layout/nav/desktop/menu-items.html" %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="hidden sm:ml-6 sm:flex sm:items-center">
|
|
||||||
{% include "layout/nav/desktop/notifications-button.html" %}
|
|
||||||
{% include "layout/nav/desktop/profile.html" %}
|
|
||||||
</div>
|
|
||||||
<div class="-mr-2 flex items-center sm:hidden">
|
|
||||||
{% include "layout/nav/mobile/menu-button.html" %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Mobile menu, show/hide based on menu state. -->
|
|
||||||
<div
|
|
||||||
class="sm:hidden" id="mobile-menu"
|
|
||||||
x-show="menuOpen"
|
|
||||||
x-cloak
|
|
||||||
>
|
|
||||||
<div class="space-y-1 pb-3 pt-2">
|
|
||||||
{% include "layout/nav/mobile/menu-items.html" %}
|
|
||||||
</div>
|
|
||||||
<div class="border-t border-gray-200 pb-3 pt-4">
|
|
||||||
<div class="flex items-center px-4">
|
|
||||||
{% include "layout/nav/mobile/profile.html" %}
|
|
||||||
{% include "layout/nav/mobile/notifications-button.html" %}
|
|
||||||
</div>
|
|
||||||
<div class="mt-3 space-y-1">
|
|
||||||
{% include "layout/nav/mobile/profile-items.html" %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
@ -1,9 +0,0 @@
|
|||||||
<div
|
|
||||||
id="nav-menu-desktop"
|
|
||||||
hx-get="/nav/menu?mobile=false"
|
|
||||||
hx-target="this"
|
|
||||||
hx-trigger="load"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
{% include "skeletons/menu-items.html" %}
|
|
||||||
</div>
|
|
@ -1,6 +0,0 @@
|
|||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="relative rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
|
||||||
>
|
|
||||||
{% include "layout/nav/notifications-icon.html" %}
|
|
||||||
</button>
|
|
@ -1,22 +0,0 @@
|
|||||||
<div
|
|
||||||
class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
|
|
||||||
role="menu"
|
|
||||||
id="profile-dropdown"
|
|
||||||
aria-orientation="vertical"
|
|
||||||
aria-labelledby="user-menu-button"
|
|
||||||
tabindex="-1"
|
|
||||||
x-show="profileOpen"
|
|
||||||
x-on:click.outside="profileOpen = false"
|
|
||||||
x-cloak
|
|
||||||
x-transition
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
id="profile-menu-desktop"
|
|
||||||
hx-get="/profile/menu?mobile=false"
|
|
||||||
hx-target="this"
|
|
||||||
hx-trigger="load"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
Chargement ...
|
|
||||||
</div>
|
|
||||||
</div>
|
|
@ -1,27 +0,0 @@
|
|||||||
<!-- Profile dropdown -->
|
|
||||||
<div
|
|
||||||
class="relative ml-3"
|
|
||||||
x-data="{ profileOpen: false }"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="relative flex max-w-xs items-center rounded-full bg-white text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
|
||||||
id="user-menu-button"
|
|
||||||
aria-controls="profile-dropdown"
|
|
||||||
aria-expanded="false"
|
|
||||||
aria-haspopup="menu"
|
|
||||||
x-on:click="profileOpen = ! profileOpen"
|
|
||||||
>
|
|
||||||
<span class="absolute -inset-1.5"></span>
|
|
||||||
<span class="sr-only">Open user menu</span>
|
|
||||||
<img
|
|
||||||
class="h-8 w-8 rounded-full"
|
|
||||||
src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
|
|
||||||
alt=""
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% include "layout/nav/desktop/profile-dropdown.html" %}
|
|
||||||
</div>
|
|
@ -1,4 +0,0 @@
|
|||||||
<div class="flex flex-shrink-0 items-center">
|
|
||||||
<img class="block h-8 w-auto lg:hidden" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
|
|
||||||
<img class="hidden h-8 w-auto lg:block" src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=600" alt="Your Company">
|
|
||||||
</div>
|
|
@ -1,43 +0,0 @@
|
|||||||
<!-- Mobile menu button -->
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="relative inline-flex items-center justify-center rounded-md bg-white p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
|
||||||
aria-controls="mobile-menu"
|
|
||||||
x-on:click="menuOpen = ! menuOpen"
|
|
||||||
x-bind:aria-expanded="menuOpen"
|
|
||||||
>
|
|
||||||
<span class="absolute -inset-0.5"></span>
|
|
||||||
<span class="sr-only">Open main menu</span>
|
|
||||||
<!-- Menu open: "hidden", Menu closed: "block" -->
|
|
||||||
<svg
|
|
||||||
class="h-6 w-6"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
stroke-width="1.5"
|
|
||||||
stroke="currentColor"
|
|
||||||
x-bind:class="menuOpen ? 'hidden' : 'block'"
|
|
||||||
x-bind:aria-hidden="menuOpen"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<!-- Menu open: "block", Menu closed: "hidden" -->
|
|
||||||
<svg
|
|
||||||
class="h-6 w-6"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
stroke-width="1.5"
|
|
||||||
stroke="currentColor"
|
|
||||||
x-bind:class="menuOpen ? 'block' : 'hidden'"
|
|
||||||
x-bind:aria-hidden="! menuOpen"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
d="M6 18L18 6M6 6l12 12"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
@ -1,9 +0,0 @@
|
|||||||
<div
|
|
||||||
id="nav-menu-mobile"
|
|
||||||
hx-get="/nav/menu?mobile=true"
|
|
||||||
hx-target="this"
|
|
||||||
hx-trigger="load"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
Chargement ...
|
|
||||||
</div>
|
|
@ -1,6 +0,0 @@
|
|||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="relative ml-auto flex-shrink-0 rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
|
|
||||||
>
|
|
||||||
{% include "layout/nav/notifications-icon.html" %}
|
|
||||||
</button>
|
|
@ -1,9 +0,0 @@
|
|||||||
<div
|
|
||||||
id="profile-menu-mobile"
|
|
||||||
hx-get="/profile/menu?mobile=true"
|
|
||||||
hx-target="this"
|
|
||||||
hx-trigger="load"
|
|
||||||
hx-swap="outerHTML"
|
|
||||||
>
|
|
||||||
Chargement ...
|
|
||||||
</div>
|
|
@ -1,11 +0,0 @@
|
|||||||
<div class="flex-shrink-0">
|
|
||||||
<img
|
|
||||||
class="h-10 w-10 rounded-full"
|
|
||||||
src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
|
|
||||||
alt=""
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="ml-3">
|
|
||||||
<div class="text-base font-medium text-gray-800">Tom Cook</div>
|
|
||||||
<div class="text-sm font-medium text-gray-500">tom@example.com</div>
|
|
||||||
</div>
|
|
@ -1,13 +0,0 @@
|
|||||||
{% for item in items %}
|
|
||||||
<a
|
|
||||||
href=""
|
|
||||||
hx-get="{{ item.href }}"
|
|
||||||
hx-trigger="click"
|
|
||||||
hx-target="#main-container"
|
|
||||||
hx-swap="innerHTML"
|
|
||||||
class="{{ Self::get_classes(self, item.current) }}"
|
|
||||||
aria-current="{% if item.current %}page{% endif %}"
|
|
||||||
>
|
|
||||||
{{ item.label }}
|
|
||||||
</a>
|
|
||||||
{% endfor %}
|
|
@ -1,16 +0,0 @@
|
|||||||
<span class="absolute -inset-1.5"></span>
|
|
||||||
<span class="sr-only">View notifications</span>
|
|
||||||
<svg
|
|
||||||
class="h-6 w-6"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
stroke-width="1.5"
|
|
||||||
stroke="currentColor"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
d="M14.857 17.082a23.848 23.848 0 005.454-1.31A8.967 8.967 0 0118 9.75v-.7V9A6 6 0 006 9v.75a8.967 8.967 0 01-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 01-5.714 0m5.714 0a3 3 0 11-5.714 0"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
@ -1,11 +0,0 @@
|
|||||||
{% for item in items %}
|
|
||||||
<a
|
|
||||||
href="#{{ item.id }}"
|
|
||||||
class="{{ Self::get_classes(self, item.current) }}"
|
|
||||||
role="menuitem"
|
|
||||||
tabindex="-1"
|
|
||||||
id="{{ item.id }}"
|
|
||||||
>
|
|
||||||
{{ item.label }}
|
|
||||||
</a>
|
|
||||||
{% endfor %}
|
|
@ -1,52 +0,0 @@
|
|||||||
<h3 id="page-title" hx-swap-oob="textContent">
|
|
||||||
CPS
|
|
||||||
</h3>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
|
||||||
></div>
|
|
||||||
<div class="grid grid-cols-2 gap-4 mb-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
|
||||||
></div>
|
|
||||||
<div class="grid grid-cols-2 gap-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
@ -1,52 +0,0 @@
|
|||||||
<h3 id="page-title" hx-swap-oob="textContent">
|
|
||||||
Accueil
|
|
||||||
</h3>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
|
||||||
></div>
|
|
||||||
<div class="grid grid-cols-2 gap-4 mb-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
|
||||||
></div>
|
|
||||||
<div class="grid grid-cols-2 gap-4">
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-48 md:h-72"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
@ -1,22 +0,0 @@
|
|||||||
<div role="status" class="animate-pulse max-w-sm p-4 border border-gray-200 rounded shadow md:p-6 dark:border-gray-700">
|
|
||||||
<div class="flex items-center justify-center h-48 mb-4 bg-gray-300 rounded dark:bg-gray-700">
|
|
||||||
<svg class="w-10 h-10 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 20">
|
|
||||||
<path d="M14.066 0H7v5a2 2 0 0 1-2 2H0v11a1.97 1.97 0 0 0 1.934 2h12.132A1.97 1.97 0 0 0 16 18V2a1.97 1.97 0 0 0-1.934-2ZM10.5 6a1.5 1.5 0 1 1 0 2.999A1.5 1.5 0 0 1 10.5 6Zm2.221 10.515a1 1 0 0 1-.858.485h-8a1 1 0 0 1-.9-1.43L5.6 10.039a.978.978 0 0 1 .936-.57 1 1 0 0 1 .9.632l1.181 2.981.541-1a.945.945 0 0 1 .883-.522 1 1 0 0 1 .879.529l1.832 3.438a1 1 0 0 1-.031.988Z"/>
|
|
||||||
<path d="M5 5V.13a2.96 2.96 0 0 0-1.293.749L.879 3.707A2.98 2.98 0 0 0 .13 5H5Z"/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
|
|
||||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
|
||||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
|
||||||
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
|
||||||
<div class="flex items-center mt-4">
|
|
||||||
<svg class="w-10 h-10 me-3 text-gray-200 dark:text-gray-700" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
|
|
||||||
<path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
|
|
||||||
</svg>
|
|
||||||
<div>
|
|
||||||
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32 mb-2"></div>
|
|
||||||
<div class="w-48 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span class="sr-only">Loading...</span>
|
|
||||||
</div>
|
|
@ -1,4 +0,0 @@
|
|||||||
<div role="status" class="animate-pulse flex items-center justify-center h-full">
|
|
||||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700 me-3"></div>
|
|
||||||
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
|
||||||
</div>
|
|
@ -1 +0,0 @@
|
|||||||
<div role="status" class="animate-pulse h-7 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mt-3"></div>
|
|
7
crates/desktop/.gitignore
vendored
@ -1,7 +0,0 @@
|
|||||||
# Generated by Cargo
|
|
||||||
# will have compiled files and executables
|
|
||||||
/target/
|
|
||||||
|
|
||||||
# Generated by Tauri
|
|
||||||
# will have schema files for capabilities auto-completion
|
|
||||||
/gen/schemas
|
|
@ -1,24 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "desktop"
|
|
||||||
version = "0.1.0"
|
|
||||||
description = "Un logiciel de pharmacie libre et open-source."
|
|
||||||
authors = ["p4pillon"]
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "desktop_lib"
|
|
||||||
crate-type = ["lib", "cdylib", "staticlib"]
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
tauri-build = { version = "2.0.0-beta", features = [] }
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
axum = "0.7.5"
|
|
||||||
tauri = { version = "2.0.0-beta", features = [] }
|
|
||||||
tower = "0.4.13"
|
|
||||||
tokio = "1.39.1"
|
|
||||||
|
|
||||||
app = { path = "../app" }
|
|
||||||
http = "1.1.0"
|
|
||||||
bytes = "1.6.1"
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
fn main() {
|
|
||||||
tauri_build::build()
|
|
||||||
}
|
|
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 974 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 7.6 KiB |
Before Width: | Height: | Size: 903 B |
Before Width: | Height: | Size: 8.4 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 14 KiB |
@ -1,69 +0,0 @@
|
|||||||
use bytes::Bytes;
|
|
||||||
use http::{request, response, Request, Response};
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use axum::body::{to_bytes, Body};
|
|
||||||
|
|
||||||
use axum::Router;
|
|
||||||
|
|
||||||
use tauri::path::BaseDirectory;
|
|
||||||
use tauri::Manager;
|
|
||||||
use tokio::sync::{Mutex, MutexGuard};
|
|
||||||
use tower::{Service, ServiceExt};
|
|
||||||
|
|
||||||
async fn process_tauri_request(
|
|
||||||
tauri_request: Request<Vec<u8>>,
|
|
||||||
mut router: MutexGuard<'_, Router>,
|
|
||||||
) -> Response<Vec<u8>> {
|
|
||||||
let (parts, body): (request::Parts, Vec<u8>) = tauri_request.into_parts();
|
|
||||||
let axum_request: Request<Body> = Request::from_parts(parts, body.into());
|
|
||||||
|
|
||||||
let axum_response: Response<Body> = router
|
|
||||||
.as_service()
|
|
||||||
.ready()
|
|
||||||
.await
|
|
||||||
.expect("Failed to get ready service from router")
|
|
||||||
.call(axum_request)
|
|
||||||
.await
|
|
||||||
.expect("Could not get response from router");
|
|
||||||
|
|
||||||
let (parts, body): (response::Parts, Body) = axum_response.into_parts();
|
|
||||||
let body: Bytes = to_bytes(body, usize::MAX).await.unwrap_or_default();
|
|
||||||
|
|
||||||
let tauri_response: Response<Vec<u8>> = Response::from_parts(parts, body.into());
|
|
||||||
|
|
||||||
tauri_response
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
|
||||||
pub fn run() {
|
|
||||||
tauri::Builder::default()
|
|
||||||
.setup(|app| {
|
|
||||||
let assets_path: PathBuf = app
|
|
||||||
.path()
|
|
||||||
.resolve("assets", BaseDirectory::Resource)
|
|
||||||
.expect("Path should be resolvable");
|
|
||||||
|
|
||||||
// Adds Axum router to application state
|
|
||||||
// This makes it so we can retrieve it from any app instance (see bellow)
|
|
||||||
let router = Arc::new(Mutex::new(app::get_router(&assets_path)));
|
|
||||||
|
|
||||||
app.manage(router);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.register_asynchronous_uri_scheme_protocol("axum", move |app, request, responder| {
|
|
||||||
// Retrieve the router from the application state and clone it for the async block
|
|
||||||
let router = Arc::clone(&app.state::<Arc<Mutex<axum::Router>>>());
|
|
||||||
|
|
||||||
// Spawn a new async task to process the request
|
|
||||||
tauri::async_runtime::spawn(async move {
|
|
||||||
let router = router.lock().await;
|
|
||||||
let response = process_tauri_request(request, router).await;
|
|
||||||
responder.respond(response);
|
|
||||||
});
|
|
||||||
})
|
|
||||||
.run(tauri::generate_context!())
|
|
||||||
.expect("error while running tauri application");
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
// Prevents additional console window on Windows in release, DO NOT REMOVE!!
|
|
||||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
desktop_lib::run()
|
|
||||||
}
|
|
@ -1,41 +0,0 @@
|
|||||||
{
|
|
||||||
"productName": "Logiciel Pharma",
|
|
||||||
"version": "0.0.1",
|
|
||||||
"identifier": "org.p4pillon.pharma.desktop",
|
|
||||||
"build": {
|
|
||||||
"beforeDevCommand": {
|
|
||||||
"cwd": "../app",
|
|
||||||
"script": "cargo run"
|
|
||||||
},
|
|
||||||
"devUrl": "http://localhost:3000",
|
|
||||||
"frontendDist": "axum://place.holder/"
|
|
||||||
},
|
|
||||||
"app": {
|
|
||||||
"withGlobalTauri": true,
|
|
||||||
"windows": [
|
|
||||||
{
|
|
||||||
"title": "Logiciel Pharma",
|
|
||||||
"width": 800,
|
|
||||||
"height": 600
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"security": {
|
|
||||||
"csp": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bundle": {
|
|
||||||
"active": true,
|
|
||||||
"resources": {
|
|
||||||
"../app/assets/": "./assets/"
|
|
||||||
},
|
|
||||||
"targets": "all",
|
|
||||||
"icon": [
|
|
||||||
"icons/32x32.png",
|
|
||||||
"icons/128x128.png",
|
|
||||||
"icons/128x128@2x.png",
|
|
||||||
"icons/icon.icns",
|
|
||||||
"icons/icon.ico"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "services-sesam-vitale-sys"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
bitvec = "1.0.1"
|
|
||||||
deku = "0.17.0"
|
|
||||||
libc = "0.2.155"
|
|
@ -1,288 +0,0 @@
|
|||||||
#![allow(non_upper_case_globals)]
|
|
||||||
#![allow(non_camel_case_types)]
|
|
||||||
#![allow(non_snake_case)]
|
|
||||||
#![allow(dead_code)]
|
|
||||||
|
|
||||||
// Generated using bindgen
|
|
||||||
|
|
||||||
extern "C" {
|
|
||||||
// Fonctions de gestion des données
|
|
||||||
|
|
||||||
pub fn SSV_LireCartePS(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_LireDroitsVitale(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
DateConsultation: *const ::std::os::raw::c_char,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_FormaterFactures(
|
|
||||||
cFactureACreer: ::std::os::raw::c_char,
|
|
||||||
cModeSecur: ::std::os::raw::c_char,
|
|
||||||
cTypeFlux: ::std::os::raw::c_char,
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
TailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_ChiffrerFacture(
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
TailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_SignerFactureVitale(
|
|
||||||
pcNomRessourceVitale: *const ::std::os::raw::c_char,
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_CalculerHashFactureAssure(
|
|
||||||
pcNumSerie: *const ::std::os::raw::c_char,
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_AjouterSignatureAssureDansFacture(
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_SignerFactureCPS(
|
|
||||||
pcNomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
pcCodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
cNologSituation: ::std::os::raw::c_char,
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_FormaterLot(
|
|
||||||
NBZDataIn: ::std::os::raw::c_short,
|
|
||||||
TZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneIn: *mut usize,
|
|
||||||
pNbZDataOut: *mut ::std::os::raw::c_short,
|
|
||||||
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_SignerLotCPS(
|
|
||||||
pcNomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
pcCodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
cNologSituation: ::std::os::raw::c_char,
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_FormaterFichier(
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
TailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_TraduireARL(
|
|
||||||
NbZDonneesEntree: ::std::os::raw::c_short,
|
|
||||||
TZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneIn: *mut usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZoneOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_LireNumSerieCarteVitale(
|
|
||||||
pcNomRessource: *mut ::std::os::raw::c_char,
|
|
||||||
numeroSerie: *mut ::std::os::raw::c_uchar,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_CalculerHashFacturePS(
|
|
||||||
pcNumSerieCPS: *const ::std::os::raw::c_char,
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
usTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pusTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_AjouterSignaturePSFacture(
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_DechargerFacturesPdT(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
pcNumFact: *const ::std::os::raw::c_char,
|
|
||||||
sNbZDataIn: ::std::os::raw::c_short,
|
|
||||||
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
psTTailleDataIn: *mut usize,
|
|
||||||
pNbZDataOut: *mut ::std::os::raw::c_short,
|
|
||||||
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_TraduireFSE(
|
|
||||||
pZDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
TailleDataIn: usize,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pTailleZone: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
// Fonctions TLA
|
|
||||||
// TLA (Terminal Lecteur Applicatif) -> lecteur autre que PC-SC, on ne prend pas en compte cela
|
|
||||||
|
|
||||||
pub fn SSV_IdentifierTLA(
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
NumVersionCDC: *const ::std::os::raw::c_char,
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
tailleDataOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_ChargerDonneesTLA(
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
sNbZDataIn: ::std::os::raw::c_short,
|
|
||||||
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
psTTailleDataIn: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_ChargerFacturesPdT(
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
pcNumFacturation: *const ::std::os::raw::c_char,
|
|
||||||
sNbZDataIn: ::std::os::raw::c_short,
|
|
||||||
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
psTTailleDataIn: *mut usize,
|
|
||||||
pNbZDataOut: *mut ::std::os::raw::c_short,
|
|
||||||
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_DechargerFSETLA(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
pcNumFact: *const ::std::os::raw::c_char,
|
|
||||||
pNbZDataOut: *mut ::std::os::raw::c_short,
|
|
||||||
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_DechargerFSETLANC(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
pcNumFact: *const ::std::os::raw::c_char,
|
|
||||||
pNbZDataOut: *mut ::std::os::raw::c_short,
|
|
||||||
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
TTailleZoneOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_DechargerBeneficiaires(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
cNumFacturation: *const ::std::os::raw::c_char,
|
|
||||||
sNbZDataOut: *mut ::std::os::raw::c_short,
|
|
||||||
pTZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
sTTailleDataOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_EffacerTLA(
|
|
||||||
NomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
CodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
cNumFacturation: *const ::std::os::raw::c_char,
|
|
||||||
cTypeDonnee: *const ::std::os::raw::c_char,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
pub fn SSV_SecuriserFacture(
|
|
||||||
pcNomRessourcePS: *const ::std::os::raw::c_char,
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
pcCodePorteurPS: *const ::std::os::raw::c_char,
|
|
||||||
cNologSituation: ::std::os::raw::c_char,
|
|
||||||
pcNumFact: *const ::std::os::raw::c_char,
|
|
||||||
pvDataIn: *mut ::std::os::raw::c_void,
|
|
||||||
szTailleDataIn: usize,
|
|
||||||
pvDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
pszTailleDataOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
// Fonctions de gestion de configuration (GALSS)
|
|
||||||
|
|
||||||
pub fn SSV_LireConfig(
|
|
||||||
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
|
||||||
psTailleDataOut: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_LireDateLecteur(
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
pcDateHeure: *mut ::std::os::raw::c_char,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_MajDateLecteur(
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
pcDateHeure: *const ::std::os::raw::c_char,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
pub fn SSV_ChargerAppli(
|
|
||||||
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
|
||||||
sNbZDataIn: ::std::os::raw::c_short,
|
|
||||||
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
psTTailleDataIn: *mut usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
// Fonctions techniques
|
|
||||||
|
|
||||||
// La fonction Initialiser Librairie a pour objet de charger et d’initialiser dans la mémoire du système :
|
|
||||||
// - dans le cas où le GALSS est installé sur le poste :
|
|
||||||
// - la bibliothèque du Gestionnaire d’Accès au Lecteur Santé Social (GALSS),
|
|
||||||
// - qui charge la bibliothèque du Protocole Santé Social (PSS),
|
|
||||||
// - la configuration du poste de travail à l’aide du fichier galssinf,
|
|
||||||
// - les variables globales communes aux différents Services SESAM-Vitale,
|
|
||||||
// - les fichiers de tables et scripts des répertoires par défaut.
|
|
||||||
// Cette fonction accède au référentiel électronique en utilisant le chemin complet indiqué dans le fichier sesam.ini.
|
|
||||||
pub fn SSV_InitLIB2(pcFichierSesam: *const ::std::os::raw::c_char) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
// La fonction Terminer a pour objet de décharger de la mémoire du système les éléments
|
|
||||||
// chargés par la fonction Initialiser Librairie, qui ne sont plus utiles.
|
|
||||||
pub fn SSV_TermLIB() -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
/// Fonctions de Tracage
|
|
||||||
//La fonction Allouer Zone Mémoire a un rôle purement technique : elle permet d’allouer, autrement dit de réserver une zone ou partie de la mémoire du poste de travail pour y écrire les données à passer en entrée d’un Service SESAM-Vitale.
|
|
||||||
// Cette fonction doit être utilisée pour allouer toutes les zones de mémoire requises en entrée des Services SESAM-Vitale de manière à permettre un diagnostic fiable par le « mode trace » en cas de dysfonctionnement. En effet, son mode d’exécution est susceptible de fournir des informations utiles au « mode trace » lorsqu’il est activé.
|
|
||||||
pub fn SSV_AllouerZoneMem(
|
|
||||||
pZDataIn: *mut *mut ::std::os::raw::c_void,
|
|
||||||
taille: usize,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
// La fonction Libérer Zone Mémoire a un rôle purement technique : elle permet de libérer une zone de mémoire du poste de travail précédemment allouée après exploitation des données qu’elle contient.
|
|
||||||
// Cette fonction doit être utilisée pour libérer toutes les zones de mémoire :
|
|
||||||
// - celles qui ont été allouées par le progiciel de santé pour fournir les données nécessaires à l’entrée des Services SESAM-Vitale, avant leur appel, celles qui ont été allouées par les Services SESAM-Vitale pour fournir en sortie les données utiles au progiciel de santé qui a fait appel à ces services,
|
|
||||||
// - de façon à permettre un diagnostic fiable par le mode trace en cas de dysfonctionnement
|
|
||||||
//En effet, son exécution est susceptible de fournir des informations utiles au « mode trace » lorsqu’il est activé.
|
|
||||||
pub fn SSV_LibererZoneMem(pZone: *mut ::std::os::raw::c_void);
|
|
||||||
|
|
||||||
// La fonction Initialiser Trace a pour objet de permettre l’activation du « mode trace ».
|
|
||||||
// Ce mode de fonctionnement est prévu pour permettre à l’assistance technique du GIE
|
|
||||||
// SESAM-Vitale d’analyser les problèmes de mise en œuvre des Services SESAM-Vitale,
|
|
||||||
// notamment lorsque une fonction retourne un code d’erreur de valeur hexadécimale supérieure à FF00.
|
|
||||||
pub fn SSV_InitTrace(
|
|
||||||
pathConf: *mut ::std::os::raw::c_char,
|
|
||||||
ModeOuvertureFicherLog: *mut ::std::os::raw::c_char,
|
|
||||||
ModuleLog: ::std::os::raw::c_ushort,
|
|
||||||
NiveauLog: ::std::os::raw::c_uchar,
|
|
||||||
) -> ::std::os::raw::c_ushort;
|
|
||||||
|
|
||||||
}
|
|
@ -1,70 +0,0 @@
|
|||||||
mod bindings;
|
|
||||||
pub mod types;
|
|
||||||
|
|
||||||
use bindings::{SSV_InitLIB2, SSV_LireConfig, SSV_TermLIB};
|
|
||||||
use std::{ffi::CString, fmt, path::Path, ptr};
|
|
||||||
use types::serialization_types::{read_from_buffer, Configuration};
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct SesamVitaleError {
|
|
||||||
code: u16,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for SesamVitaleError {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
write!(f, "Got error code {} from SSV_LireConfig", self.code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn init_library(sesam_ini_path: &Path) -> Result<(), SesamVitaleError> {
|
|
||||||
// TODO: better error handling
|
|
||||||
let path_str = sesam_ini_path.to_str().unwrap();
|
|
||||||
let path_ptr = CString::new(path_str).expect("failed to create cstring");
|
|
||||||
|
|
||||||
let exit_code: u16 = unsafe { SSV_InitLIB2(path_ptr.as_ptr()) };
|
|
||||||
if exit_code != 0 {
|
|
||||||
let error = SesamVitaleError { code: exit_code };
|
|
||||||
return Err(error);
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
pub fn close_library() -> Result<(), SesamVitaleError> {
|
|
||||||
let exit_code: u16 = unsafe { SSV_TermLIB() };
|
|
||||||
if exit_code != 0 {
|
|
||||||
let error = SesamVitaleError { code: exit_code };
|
|
||||||
return Err(error);
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn read_config() -> Result<Configuration, SesamVitaleError> {
|
|
||||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
|
||||||
let mut size: libc::size_t = 0;
|
|
||||||
|
|
||||||
let buffer_ptr_ptr: *mut *mut libc::c_void = &mut buffer_ptr;
|
|
||||||
let size_ptr: *mut libc::size_t = &mut size;
|
|
||||||
|
|
||||||
// Need to add proper error handling -> return a result with error code pointing to an error
|
|
||||||
// enum
|
|
||||||
let exit_code: u16 = unsafe { SSV_LireConfig(buffer_ptr_ptr, size_ptr) };
|
|
||||||
|
|
||||||
if exit_code != 0 {
|
|
||||||
let error = SesamVitaleError { code: exit_code };
|
|
||||||
return Err(error);
|
|
||||||
};
|
|
||||||
|
|
||||||
let buffer: &[u8] = unsafe { std::slice::from_raw_parts(buffer_ptr as *const u8, size) };
|
|
||||||
|
|
||||||
// TODO: Improve error handling
|
|
||||||
let configuration: Configuration = read_from_buffer(buffer).unwrap();
|
|
||||||
|
|
||||||
// TODO: Call library function for memory delocating
|
|
||||||
unsafe { libc::free(buffer_ptr) };
|
|
||||||
|
|
||||||
Ok(configuration)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {}
|
|
@ -1,264 +0,0 @@
|
|||||||
pub struct Identification<T> {
|
|
||||||
value: T,
|
|
||||||
// Key to check the validity of the value
|
|
||||||
// TODO: implement checking algorithm
|
|
||||||
key: u8,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type Byte = u8;
|
|
||||||
|
|
||||||
pub(crate) enum IdentificationNationale {
|
|
||||||
NumeroAdeli(String),
|
|
||||||
NumeroEmployeeDansStructure(IdentificationStructure, String),
|
|
||||||
NumeroDRASS(String),
|
|
||||||
NumeroRPPS(String),
|
|
||||||
/// N° Etudiant Médecin type ADELI sur 9 caractères (information transmise par l’ANS)
|
|
||||||
NumeroEtudiantMedecin(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum TypeCarteProfessionnelSante {
|
|
||||||
/// Carte de Professionnel de Santé (CPS)
|
|
||||||
CarteDeProfessionnelSante,
|
|
||||||
/// Carte de Professionnel de Santé en Formation (CPF)
|
|
||||||
CarteDeProfessionnelSanteEnFormation,
|
|
||||||
/// Carte de Personnel d'Établissement de Santé (CDE/CPE)
|
|
||||||
CarteDePersonnelEtablissementSante,
|
|
||||||
/// Carte de Personnel Autorisé (CDA/CPA)
|
|
||||||
CarteDePersonnelAutorise,
|
|
||||||
/// Carte de Personne Morale
|
|
||||||
CarteDePersonneMorale,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum CategorieCarteProfessionnelSante {
|
|
||||||
Reelle,
|
|
||||||
Test,
|
|
||||||
Demonstration,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum CodeCivilite {
|
|
||||||
Adjudant,
|
|
||||||
Amiral,
|
|
||||||
Aspirant,
|
|
||||||
Aumônier,
|
|
||||||
Capitaine,
|
|
||||||
Cardinal,
|
|
||||||
Chanoine,
|
|
||||||
Colonel,
|
|
||||||
Commandant,
|
|
||||||
Commissaire,
|
|
||||||
Conseiller,
|
|
||||||
Directeur,
|
|
||||||
Docteur,
|
|
||||||
Douanier,
|
|
||||||
Epouxse, // Epoux(se)
|
|
||||||
Evêque,
|
|
||||||
Général,
|
|
||||||
Gouverneur,
|
|
||||||
Ingénieur,
|
|
||||||
Inspecteur,
|
|
||||||
Lieutenant,
|
|
||||||
Madame,
|
|
||||||
Mademoiselle,
|
|
||||||
Maître,
|
|
||||||
Maréchal,
|
|
||||||
Médecin,
|
|
||||||
Mesdames,
|
|
||||||
Mesdemoiselles,
|
|
||||||
Messieurs,
|
|
||||||
Monseigneur,
|
|
||||||
Monsieur,
|
|
||||||
NotreDame,
|
|
||||||
Pasteur,
|
|
||||||
Préfet,
|
|
||||||
Président,
|
|
||||||
Professeur,
|
|
||||||
Recteur,
|
|
||||||
Sergent,
|
|
||||||
SousPréfet,
|
|
||||||
Technicien,
|
|
||||||
Veuve,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum IdentificationStructure {
|
|
||||||
NumeroAdeliCabinet(String),
|
|
||||||
NumeroFINESS(String),
|
|
||||||
NumeroSIREN(String),
|
|
||||||
NumeroSIRET(String),
|
|
||||||
NumeroRPPSCabinet(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum ModeExercice {
|
|
||||||
LiberalExploitantCommercant, // Libéral, exploitant, commerçant
|
|
||||||
Salarie,
|
|
||||||
Remplacant,
|
|
||||||
Benevole,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum StatutExercice {
|
|
||||||
// TAB-Statuts géré par l’ANS il faut trouver la donnee
|
|
||||||
PLACEHOLDER(u8),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum SecteurActivite {
|
|
||||||
EtablissementPublicDeSanté,
|
|
||||||
HopitauxMilitaires,
|
|
||||||
EtablissementPrivePSPH, // Participant au Service Public Hospitalier
|
|
||||||
EtablissementPriveNonPSPH,
|
|
||||||
DispensaireDeSoins,
|
|
||||||
AutresStructuresDeSoinsRelevantDuServiceDeSanteDesArmees,
|
|
||||||
CabinetIndividuel,
|
|
||||||
CabinetDeGroupe,
|
|
||||||
ExerciceEnSociete,
|
|
||||||
SecteurPrivePHTempsPlein,
|
|
||||||
TransportSanitaire,
|
|
||||||
EntrepriseDInterim,
|
|
||||||
EtablissementDeSoinsEtPrevention,
|
|
||||||
PreventionEtSoinsEnEntreprise,
|
|
||||||
SanteScolaireEtUniversitaire,
|
|
||||||
RecrutementEtGestionRH,
|
|
||||||
PMIPlanificationFamiliale,
|
|
||||||
EtablissementPourHandicapes,
|
|
||||||
ComMarketingConsultingMedia,
|
|
||||||
EtablissementPersonnesAgees,
|
|
||||||
EtablissementAideaLaFamille,
|
|
||||||
EtablissementDEnseignement,
|
|
||||||
EtablissementsDeProtectionDeLEnfance,
|
|
||||||
EtablissementsDHebergementEtDeReadaptation,
|
|
||||||
Recherche,
|
|
||||||
AssurancePrivee,
|
|
||||||
OrganismeDeSecuriteSociale,
|
|
||||||
MinistèreEtServicesDeconcentres,
|
|
||||||
CollectivitesTerritoriales,
|
|
||||||
AssociationsEtOrganitationsHumanitaire,
|
|
||||||
LaboratoireDeBiologieMedicale,
|
|
||||||
AutreEtablissementSanitaire,
|
|
||||||
ProductionCommercialisationGrosBienMedicaux,
|
|
||||||
CommerceDétailDeBiensMédicaux,
|
|
||||||
PharmacieDOfficine,
|
|
||||||
CentreDeDialyse,
|
|
||||||
ParaPharmacie,
|
|
||||||
AutreSecteurDActivité,
|
|
||||||
SecteurNonDefini,
|
|
||||||
CentreAntiCancer,
|
|
||||||
CentreDeTransfusionSanguine,
|
|
||||||
RépartitionDistribributionFabricationExploitationImportationMedicamentsEtDispositifsMédicaux,
|
|
||||||
IncendiesEtSecours,
|
|
||||||
EntreprisesIndustriellesEtTertiairesHorsIndustriesPharmaceutiques,
|
|
||||||
EntiteDUnTOM,
|
|
||||||
FabricationExploitationImportationMedicamentsEtDispositifsMedicaux,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) type IdentificationFacturation = u32;
|
|
||||||
pub(crate) enum CodeConventionnel {
|
|
||||||
NonConventionne,
|
|
||||||
Conventionne,
|
|
||||||
ConventionneAvecDepassement,
|
|
||||||
ConventionneAvecHonorairesLibres,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Code spécialité ou Code spécialité de l'exécutant
|
|
||||||
pub(crate) enum CodeSpecialite {
|
|
||||||
MedecineGenerale,
|
|
||||||
AnesthesieReanimation,
|
|
||||||
Cardiologie,
|
|
||||||
ChirurgieGenerale,
|
|
||||||
DermatologieEtVenerologie,
|
|
||||||
Radiologie,
|
|
||||||
GynecologieObstetrique,
|
|
||||||
GastroEnterologieEtHepatologie,
|
|
||||||
MedecineInterne,
|
|
||||||
NeuroChirurgie,
|
|
||||||
OtoRhinoLaryngologie,
|
|
||||||
Pediatrie,
|
|
||||||
Pneumologie,
|
|
||||||
Rhumatologie,
|
|
||||||
Ophtalmologie,
|
|
||||||
ChirurgieUrologique,
|
|
||||||
NeuroPsychiatrie,
|
|
||||||
Stomatologie,
|
|
||||||
ChirurgienDentiste,
|
|
||||||
ReanimationMedicale,
|
|
||||||
SageFemme,
|
|
||||||
SpecialisteEnMedecineGeneraleAvecDiplome,
|
|
||||||
SpecialisteEnMedecineGeneraleReconnuParLOrdre,
|
|
||||||
Infirmier,
|
|
||||||
Psychologue,
|
|
||||||
MasseurKinesitherapeute,
|
|
||||||
PedicurePodologue,
|
|
||||||
Orthophoniste,
|
|
||||||
Orthoptiste,
|
|
||||||
LaboratoireDAnalysesMedicales,
|
|
||||||
ReeducationReadaptationFonctionnelle,
|
|
||||||
Neurologie,
|
|
||||||
Psychiatrie,
|
|
||||||
Geriatrie,
|
|
||||||
Nephrologie,
|
|
||||||
ChirurgieDentaireSpecialiteODF,
|
|
||||||
AnatomoCytoPathologie,
|
|
||||||
MedecinBiologiste,
|
|
||||||
LaboratoirePolyvalent,
|
|
||||||
LaboratoireDAnatomoCytoPathologique,
|
|
||||||
ChirurgieOrthopediqueEtTraumatologie,
|
|
||||||
EndocrinologieEtMetabolisme,
|
|
||||||
ChirurgieInfantile,
|
|
||||||
ChirurgieMaxilloFaciale,
|
|
||||||
ChirurgieMaxilloFacialeEtStomatologie,
|
|
||||||
ChirurgiePlastiqueReconstructriceEtEsthetique,
|
|
||||||
ChirurgieThoraciqueEtCardioVasculaire,
|
|
||||||
ChirurgieVasculaire,
|
|
||||||
ChirurgieVisceraleEtDigestive,
|
|
||||||
PharmacieDOfficine,
|
|
||||||
PharmacieMutualiste,
|
|
||||||
ChirurgienDentisteSpecialiteCO,
|
|
||||||
ChirurgienDentisteSpecialiteMBD,
|
|
||||||
PrestataireDeTypeSociete,
|
|
||||||
PrestataireArtisan,
|
|
||||||
PrestataireDeTypeAssociation,
|
|
||||||
Orthesiste,
|
|
||||||
Opticien,
|
|
||||||
Audioprothesiste,
|
|
||||||
ÉpithesisteOculariste,
|
|
||||||
PodoOrthesiste,
|
|
||||||
Orthoprothesiste,
|
|
||||||
ChirurgieOrale,
|
|
||||||
GynecologieMedicale,
|
|
||||||
Hematologie,
|
|
||||||
MedecineNucleaire,
|
|
||||||
OncologieMedicale,
|
|
||||||
OncologieRadiotherapique,
|
|
||||||
PsychiatrieDeLEnfantEtDeLAdolescent,
|
|
||||||
Radiotherapie,
|
|
||||||
Obstetrique,
|
|
||||||
GenetiqueMedicale,
|
|
||||||
ObstetriqueEtGynecologieMedicale,
|
|
||||||
SantePubliqueEtMedecineSociale,
|
|
||||||
MedecineDesMaladiesInfectieusesEtTropicales,
|
|
||||||
MedecineLegaleEtExpertisesMedicales,
|
|
||||||
MedecineDUrgence,
|
|
||||||
MedecineVasculaire,
|
|
||||||
Allergologie,
|
|
||||||
InfirmierExercantEnPratiquesAvancees, // IPA
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Page 54 dictionnaires des donnees
|
|
||||||
/// donnees inutilises pour les pharmacies
|
|
||||||
pub(crate) enum CodeZoneTarifaire {}
|
|
||||||
|
|
||||||
pub(crate) enum CodeZoneIK {
|
|
||||||
PasIndemniteKilometrique,
|
|
||||||
IndemnitesKilometriquesPlaine,
|
|
||||||
IndemnitesKilometriquesMontagne,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) enum CodeAgrement {
|
|
||||||
PasDAgrementRadio,
|
|
||||||
/// Agrément D ou agrément DDASS
|
|
||||||
AgrementDDASS,
|
|
||||||
/// Agrément A, B, C, E et F
|
|
||||||
AgrementABCEF,
|
|
||||||
/// Agrément G, H et J
|
|
||||||
AgrementGHJ,
|
|
||||||
AgrementK,
|
|
||||||
AgrementL,
|
|
||||||
AgrementM,
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
pub mod serialization_types;
|
|
@ -1,248 +0,0 @@
|
|||||||
use bitvec::index::BitIdx;
|
|
||||||
use std::{error::Error, fmt, str::FromStr, vec::Vec};
|
|
||||||
|
|
||||||
use deku::{
|
|
||||||
bitvec::{BitStore, Msb0}, ctx::ByteSize, deku_derive, reader::{Reader, ReaderRet}, DekuContainerRead, DekuError, DekuReader
|
|
||||||
};
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
|
||||||
#[deku(endian = "big")]
|
|
||||||
pub(crate) struct GroupId(u16);
|
|
||||||
|
|
||||||
trait MapToDekuParseError<T> {
|
|
||||||
fn map_to_deku_parse_error(self) -> Result<T, DekuError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T, E: Error> MapToDekuParseError<T> for Result<T, E> {
|
|
||||||
fn map_to_deku_parse_error(self) -> Result<T, DekuError> {
|
|
||||||
self.map_err(|e| DekuError::Parse(e.to_string().into()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub(crate) struct DataField {
|
|
||||||
#[deku(reader = "read_size(deku::reader)")]
|
|
||||||
pub(crate) data_size: ByteSize,
|
|
||||||
|
|
||||||
#[deku(bytes_read = "data_size.0")]
|
|
||||||
pub(crate) data: Vec<u8>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub(crate) struct BlockHeader {
|
|
||||||
pub(crate) group_id: GroupId,
|
|
||||||
|
|
||||||
#[deku(reader = "read_size(deku::reader)")]
|
|
||||||
pub(crate) data_size: ByteSize,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub(crate) struct DataBlock {
|
|
||||||
pub(crate) header: BlockHeader,
|
|
||||||
|
|
||||||
#[deku(ctx = "header.group_id")]
|
|
||||||
pub(crate) inner: DataGroup,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn read_size<R: std::io::Read>(reader: &mut Reader<R>) -> Result<ByteSize, DekuError> {
|
|
||||||
let first_byte: u8 = u8::from_reader_with_ctx(reader, ())?;
|
|
||||||
|
|
||||||
let is_length_expanded = first_byte.get_bit::<Msb0>(BitIdx::new(0).map_to_deku_parse_error()?);
|
|
||||||
|
|
||||||
match is_length_expanded {
|
|
||||||
true => {
|
|
||||||
let size_of_data_size: ByteSize = ByteSize((first_byte & 0b0111_1111) as usize);
|
|
||||||
|
|
||||||
if size_of_data_size.0 > 4 {
|
|
||||||
return Err(DekuError::Parse("Size of the length encoding is > 4, this is not normal. Probable parsing error".to_string().into()));
|
|
||||||
};
|
|
||||||
|
|
||||||
// maximum size of the buffer is 4, we use the offset to read values less than 4 bytes
|
|
||||||
let buffer: &mut [u8; 4] = &mut [0; 4];
|
|
||||||
let write_offset = 4 - size_of_data_size.0;
|
|
||||||
|
|
||||||
match reader.read_bytes(size_of_data_size.0, &mut buffer[write_offset..])? {
|
|
||||||
ReaderRet::Bits(_bit_vec) => Err(DekuError::Parse("Got bits when trying to read bytes -> reader is unaligned, this is not normal.".to_string().into())),
|
|
||||||
ReaderRet::Bytes => Ok(ByteSize(u32::from_be_bytes(*buffer) as usize)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
false => Ok(ByteSize(first_byte as usize)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Using this as the map function asks deku to parse a datafield
|
|
||||||
// We then use the datafield and convert it to the corresponding value
|
|
||||||
fn convert_from_data_field<T>(data_field: DataField) -> Result<T, DekuError>
|
|
||||||
where
|
|
||||||
T: FromStr,
|
|
||||||
T::Err: Error,
|
|
||||||
{
|
|
||||||
let text = String::from_utf8(data_field.data).map_to_deku_parse_error()?;
|
|
||||||
T::from_str(&text).map_to_deku_parse_error()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct SSVVersionNumber(#[deku(map = "convert_from_data_field")] u16);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct GALSSVersionNumber(#[deku(map = "convert_from_data_field")] u16);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct PSSVersionNumber(#[deku(map = "convert_from_data_field")] u16);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct ConfigurationHeader {
|
|
||||||
pub ssv_version: SSVVersionNumber,
|
|
||||||
pub galss_version: GALSSVersionNumber,
|
|
||||||
pub pss_version: PSSVersionNumber,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct PCSCReaderName(#[deku(map = "convert_from_data_field")] String);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct CardType(#[deku(map = "convert_from_data_field")] u8);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct PCSCReader {
|
|
||||||
pub name: PCSCReaderName,
|
|
||||||
pub card_type: CardType,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct SESAMVitaleComponentID(#[deku(map = "convert_from_data_field")] u16);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct SESAMVitaleComponentDescription(#[deku(map = "convert_from_data_field")] String);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct SESAMVitaleComponentVersion(#[deku(map = "convert_from_data_field")] String);
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct SESAMVitaleComponent {
|
|
||||||
pub id: SESAMVitaleComponentID,
|
|
||||||
pub description: SESAMVitaleComponentDescription,
|
|
||||||
pub version: SESAMVitaleComponentVersion,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub struct ReaderConfiguration {}
|
|
||||||
|
|
||||||
#[deku_derive(DekuRead)]
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
#[deku(ctx = "group_id: GroupId", id = "group_id.0")]
|
|
||||||
pub enum DataGroup {
|
|
||||||
#[deku(id = 60)]
|
|
||||||
ConfigurationHeader(ConfigurationHeader),
|
|
||||||
#[deku(id = 61)]
|
|
||||||
ReaderConfiguration(ReaderConfiguration),
|
|
||||||
#[deku(id = 64)]
|
|
||||||
SESAMVitaleComponent(SESAMVitaleComponent),
|
|
||||||
#[deku(id = 67)]
|
|
||||||
PCSCReader(PCSCReader),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum ConfigurationError {
|
|
||||||
MultipleConfigurationHeaders,
|
|
||||||
MissingConfigurationHeader,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for ConfigurationError {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
ConfigurationError::MultipleConfigurationHeaders => {
|
|
||||||
write!(f, "Multiple ConfigurationHeader blocks found")
|
|
||||||
}
|
|
||||||
ConfigurationError::MissingConfigurationHeader => {
|
|
||||||
write!(f, "Missing ConfigurationHeader block")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Error for ConfigurationError {}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Configuration {
|
|
||||||
pub configuration_header: ConfigurationHeader,
|
|
||||||
pub reader_configurations: Vec<ReaderConfiguration>,
|
|
||||||
pub sesam_vitale_components: Vec<SESAMVitaleComponent>,
|
|
||||||
pub pcsc_readers: Vec<PCSCReader>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<Vec<DataBlock>> for Configuration {
|
|
||||||
type Error = ConfigurationError;
|
|
||||||
|
|
||||||
fn try_from(data_blocks: Vec<DataBlock>) -> Result<Self, Self::Error> {
|
|
||||||
let mut configuration_header: Option<ConfigurationHeader> = None;
|
|
||||||
let mut reader_configurations: Vec<ReaderConfiguration> = Vec::new();
|
|
||||||
let mut sesam_vitale_components: Vec<SESAMVitaleComponent> = Vec::new();
|
|
||||||
let mut pcsc_readers: Vec<PCSCReader> = Vec::new();
|
|
||||||
|
|
||||||
for block in data_blocks {
|
|
||||||
match block.inner {
|
|
||||||
DataGroup::ConfigurationHeader(header) => {
|
|
||||||
if configuration_header.is_some() {
|
|
||||||
return Err(ConfigurationError::MultipleConfigurationHeaders);
|
|
||||||
}
|
|
||||||
configuration_header = Some(header);
|
|
||||||
}
|
|
||||||
DataGroup::ReaderConfiguration(configuration) => {
|
|
||||||
reader_configurations.push(configuration)
|
|
||||||
}
|
|
||||||
DataGroup::SESAMVitaleComponent(component) => {
|
|
||||||
sesam_vitale_components.push(component);
|
|
||||||
}
|
|
||||||
DataGroup::PCSCReader(reader) => {
|
|
||||||
pcsc_readers.push(reader);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let configuration_header = match configuration_header {
|
|
||||||
Some(header) => header,
|
|
||||||
None => return Err(ConfigurationError::MissingConfigurationHeader),
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
configuration_header,
|
|
||||||
reader_configurations,
|
|
||||||
sesam_vitale_components,
|
|
||||||
pcsc_readers,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn read_from_buffer<T: TryFrom<Vec<DataBlock>>>(buffer: &[u8]) -> Result<T, T::Error>{
|
|
||||||
let mut data_blocks: Vec<DataBlock> = Vec::new();
|
|
||||||
let mut offset = 0;
|
|
||||||
|
|
||||||
let mut remaining_buffer = buffer;
|
|
||||||
|
|
||||||
while !remaining_buffer.is_empty() {
|
|
||||||
// TODO: properly handle errors
|
|
||||||
let (rest, data_block) = DataBlock::from_bytes((remaining_buffer, offset)).unwrap();
|
|
||||||
|
|
||||||
data_blocks.push(data_block);
|
|
||||||
|
|
||||||
(remaining_buffer, offset) = rest;
|
|
||||||
};
|
|
||||||
|
|
||||||
T::try_from(data_blocks)
|
|
||||||
}
|
|
@ -1,45 +0,0 @@
|
|||||||
pub(crate) use crate::types::common::IdentificationNationale;
|
|
||||||
|
|
||||||
use super::common::{
|
|
||||||
Byte, CategorieCarteProfessionnelSante, CodeAgrement, CodeCivilite, CodeConventionnel,
|
|
||||||
CodeSpecialite, CodeZoneIK, CodeZoneTarifaire, Identification, IdentificationFacturation,
|
|
||||||
IdentificationStructure, ModeExercice, SecteurActivite, StatutExercice,
|
|
||||||
TypeCarteProfessionnelSante,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub(crate) struct CarteProfessionnelSante {
|
|
||||||
type_carte: TypeCarteProfessionnelSante,
|
|
||||||
categorie_carte: CategorieCarteProfessionnelSante,
|
|
||||||
professionnel_sante: ProfessionnelDeSante,
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ProfessionnelDeSante {
|
|
||||||
prenom: String,
|
|
||||||
nom: String,
|
|
||||||
code_civilite: CodeCivilite,
|
|
||||||
identification_nationale: Identification<IdentificationNationale>,
|
|
||||||
situations_execice: Vec<SituationDExercice>,
|
|
||||||
}
|
|
||||||
struct StructureMedicale {
|
|
||||||
/// Nom Entreprise
|
|
||||||
raison_sociale: String,
|
|
||||||
identification: Identification<IdentificationStructure>,
|
|
||||||
}
|
|
||||||
|
|
||||||
struct SituationDExercice {
|
|
||||||
/// Numéro identifiant la situation du PS parmi ses autres situations inscrites sur sa CPS
|
|
||||||
identifiant_situation: Byte,
|
|
||||||
mode_exercice: Option<ModeExercice>,
|
|
||||||
statut_exercice: Option<StatutExercice>,
|
|
||||||
secteur_activite: Option<SecteurActivite>,
|
|
||||||
structure_d_exercice: Option<StructureMedicale>,
|
|
||||||
identification_facturation: Identification<IdentificationFacturation>,
|
|
||||||
identification_remplacant: Option<Identification<IdentificationNationale>>,
|
|
||||||
code_conventionnel: CodeConventionnel,
|
|
||||||
code_specialite: CodeSpecialite,
|
|
||||||
code_zone_tarifaire: CodeZoneTarifaire,
|
|
||||||
code_zone_ik: CodeZoneIK,
|
|
||||||
code_agrement: CodeAgrement,
|
|
||||||
habilite_signature_facture: bool,
|
|
||||||
habilite_signature_lot: bool,
|
|
||||||
}
|
|
9
crates/sesam-vitale/.gitignore
vendored
@ -1,9 +0,0 @@
|
|||||||
# Ignore Rust target directory
|
|
||||||
/target
|
|
||||||
|
|
||||||
# Ignore .env files
|
|
||||||
.env
|
|
||||||
.env.build
|
|
||||||
|
|
||||||
# Ignore exploitation files - only usefull for local debugging on windows
|
|
||||||
lib/*.exp
|
|
@ -1,11 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "sesam-vitale"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
dotenv = "0.15"
|
|
||||||
libc = "0.2"
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
dotenv = "0.15"
|
|
@ -1,34 +0,0 @@
|
|||||||
## Requirements
|
|
||||||
|
|
||||||
- Installer le [package FSV](https://industriels.sesam-vitale.fr/group/fournitures-sesam-vitale)
|
|
||||||
- Les librairies dynamiques (.lib, .dll, ...) fournies ne sont pas installés dans les emplacements standard du système, il faudra donc configurer leur chemin d'installation dans le fichier de configuration `.env.build` (voir ci-dessous)
|
|
||||||
- Le détail des chemins d'installation est donné dans la documentation du package FSV `fsv-mi-004_pack-FSV1.40.14_V2.3.pdf`
|
|
||||||
- Linux - par défaut : `/opt/santesocial/fsv/1.40.13/lib`
|
|
||||||
- Windows - par défaut : `C:\Program Files\santesocial\santesocial\fsv\1.40.14\lib` (ou dans Program Files (x86) si c'est le package 32bits qui a été installé)
|
|
||||||
|
|
||||||
- Installer la [CryptolibCPS](https://industriels.sesam-vitale.fr/group/galss-cryptolib-cps)
|
|
||||||
- Ce package fourni également l'utilitaire "CPS Gestion" pour obtenir des informations sur le lecteur de carte, etc.
|
|
||||||
- Linux : `cpgeslux`
|
|
||||||
- Windows : `...`
|
|
||||||
|
|
||||||
## Setup
|
|
||||||
|
|
||||||
- Créer et éditer le fichier de configuration de build `.env.build` en s'inspirant d'un des fichiers d'exemple (`.env.build.linux.example`, `.env.build.win.example`...)
|
|
||||||
- Ce fichier est nécessaire pour le build du package Rust
|
|
||||||
- Créer et éditer le fichier de configuration de l'exécution `.env` en s'inspirant d'un des fichiers d'exemple (`.env.linux.example`, `.env.win.example`...)
|
|
||||||
- Ce fichier est nécessaire pour l'exécution du package Rust compilé, et doit donc être présent aux côtés de l'exécutable généré, le cas échéant
|
|
||||||
|
|
||||||
## Build
|
|
||||||
|
|
||||||
### Windows - Compilation des headers FSV
|
|
||||||
|
|
||||||
Sous windows, la librairie dynamique fournie par le package FSV nécessite des headers qui ne sont pas présents dans la `.dll`. Il est donc nécessaire de fournir ces headers, en les renseignant dans des fichiers `crates/sesam-vitale/src/win/fsv/*.def` qui seront compilés en leur version binaire `crates/sesam-vitale/lib/*.lib`.
|
|
||||||
|
|
||||||
En cas de modification des fichiers `.def`, pour re-compiler ces headers, faire appel au script `scripts/compile_win_headers.bat`.
|
|
||||||
|
|
||||||
| /!\ Attention, le script `compile_win_headers.bat` exécute, en interne, l'utilitaire `vcvarsall.bat` et le linker `lib.exe` de Visual Studio. Visual Studio doit donc être installé et le chemin vers l'intallation le script `vcvarsall.bat`, écrit en dur dans le script `compile_win_headers.bat` doit être adapté à votre installation.
|
|
||||||
|
|
||||||
## À creuser
|
|
||||||
|
|
||||||
- Compilation cross platform facilitée par du Docker : https://github.com/cross-rs/cross
|
|
||||||
- Pour éviter l'usage de dotenv pour la configuration, on peut utiliser https://direnv.net/
|
|
@ -1,408 +0,0 @@
|
|||||||
use libc::{c_void, size_t};
|
|
||||||
use std::ffi::CString;
|
|
||||||
use std::ptr;
|
|
||||||
|
|
||||||
use crate::libssv::SSV_LireCartePS;
|
|
||||||
use crate::ssv_memory::{decode_ssv_memory, Block};
|
|
||||||
|
|
||||||
#[derive(Debug, Default)]
|
|
||||||
pub struct CartePS {
|
|
||||||
titulaire: TitulairePS,
|
|
||||||
situations: Vec<SituationPS>,
|
|
||||||
}
|
|
||||||
|
|
||||||
// 1. CB = Caractères Binaires »
|
|
||||||
// 2. CE = Caractères « Etendus » (ISO 8859-1)
|
|
||||||
// 3. CA = Caractères Alphanumériques (ASCII?)
|
|
||||||
// 4. CN = Caractères Numériques
|
|
||||||
#[derive(Debug, Default)]
|
|
||||||
struct TitulairePS {
|
|
||||||
type_de_carte_ps: String, // CN
|
|
||||||
type_d_identification_nationale: String, // CN
|
|
||||||
numero_d_identification_nationale: String, // CE - 8 -> 30
|
|
||||||
cle_du_numero_d_identification_nationale: String, // CN
|
|
||||||
code_civilite: String, // CN
|
|
||||||
nom_du_ps: String, // CE - 27
|
|
||||||
prenom_du_ps: String, // CE - 27
|
|
||||||
categorie_carte: char, // CA
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Default)]
|
|
||||||
struct SituationPS {
|
|
||||||
numero_logique_de_la_situation_de_facturation_du_ps: u8,
|
|
||||||
mode_d_exercice: String,
|
|
||||||
statut_d_exercice: String,
|
|
||||||
secteur_d_activite: String,
|
|
||||||
type_d_identification_structure: String,
|
|
||||||
numero_d_identification_structure: String,
|
|
||||||
cle_du_numero_d_identification_structure: String,
|
|
||||||
raison_sociale_structure: String,
|
|
||||||
numero_d_identification_de_facturation_du_ps: String,
|
|
||||||
cle_du_numero_d_identification_de_facturation_du_ps: String,
|
|
||||||
numero_d_identification_du_ps_remplaçant: String,
|
|
||||||
cle_du_numero_d_identification_du_ps_remplaçant: String,
|
|
||||||
code_conventionnel: String,
|
|
||||||
code_specialite: String,
|
|
||||||
code_zone_tarifaire: String,
|
|
||||||
code_zone_ik: String,
|
|
||||||
code_agrement_1: String,
|
|
||||||
code_agrement_2: String,
|
|
||||||
code_agrement_3: String,
|
|
||||||
habilitation_à_signer_une_facture: String,
|
|
||||||
habilitation_à_signer_un_lot: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn lire_carte(code_pin: &str, lecteur: &str) -> Result<CartePS, String> {
|
|
||||||
let resource_ps = CString::new(lecteur).expect("CString::new failed");
|
|
||||||
let resource_reader = CString::new("").expect("CString::new failed");
|
|
||||||
let card_number = CString::new(code_pin).expect("CString::new failed");
|
|
||||||
|
|
||||||
let mut buffer: *mut c_void = ptr::null_mut();
|
|
||||||
let mut size: size_t = 0;
|
|
||||||
let mut hex_values: &[u8] = &[];
|
|
||||||
unsafe {
|
|
||||||
let result = SSV_LireCartePS(
|
|
||||||
resource_ps.as_ptr(),
|
|
||||||
resource_reader.as_ptr(),
|
|
||||||
card_number.as_ptr(),
|
|
||||||
&mut buffer,
|
|
||||||
&mut size,
|
|
||||||
);
|
|
||||||
println!("SSV_LireCartePS result: {}", result);
|
|
||||||
|
|
||||||
if !buffer.is_null() {
|
|
||||||
hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
|
|
||||||
libc::free(buffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let groups = decode_ssv_memory(hex_values, hex_values.len());
|
|
||||||
decode_carte_ps(groups)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn decode_carte_ps(groups: Vec<Block>) -> Result<CartePS, String> {
|
|
||||||
let mut carte_ps = CartePS::default();
|
|
||||||
for group in groups {
|
|
||||||
for field in group.content {
|
|
||||||
match (group.id, field.id) {
|
|
||||||
(1, 1) => {
|
|
||||||
carte_ps.titulaire.type_de_carte_ps =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 2) => {
|
|
||||||
carte_ps.titulaire.type_d_identification_nationale =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 3) => {
|
|
||||||
carte_ps.titulaire.numero_d_identification_nationale =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 4) => {
|
|
||||||
carte_ps.titulaire.cle_du_numero_d_identification_nationale =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 5) => {
|
|
||||||
carte_ps.titulaire.code_civilite =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 6) => {
|
|
||||||
carte_ps.titulaire.nom_du_ps =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 7) => {
|
|
||||||
carte_ps.titulaire.prenom_du_ps =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(1, 8) => {
|
|
||||||
let byte = field.content[0];
|
|
||||||
carte_ps.titulaire.categorie_carte = byte as char;
|
|
||||||
}
|
|
||||||
(2..=16, 1) => {
|
|
||||||
carte_ps.situations.push(SituationPS::default());
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.numero_logique_de_la_situation_de_facturation_du_ps = field.content[0];
|
|
||||||
}
|
|
||||||
(2..=16, 2) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().mode_d_exercice =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 3) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().statut_d_exercice =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 4) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().secteur_d_activite =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 5) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.type_d_identification_structure =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 6) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.numero_d_identification_structure =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 7) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.cle_du_numero_d_identification_structure =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 8) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.raison_sociale_structure =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 9) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.numero_d_identification_de_facturation_du_ps =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 10) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.cle_du_numero_d_identification_de_facturation_du_ps =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 11) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.numero_d_identification_du_ps_remplaçant =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 12) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.cle_du_numero_d_identification_du_ps_remplaçant =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 13) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_conventionnel =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 14) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_specialite =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 15) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_zone_tarifaire =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 16) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_zone_ik =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 17) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_agrement_1 =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 18) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_agrement_2 =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 19) => {
|
|
||||||
carte_ps.situations.last_mut().unwrap().code_agrement_3 =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 20) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.habilitation_à_signer_une_facture =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
(2..=16, 21) => {
|
|
||||||
carte_ps
|
|
||||||
.situations
|
|
||||||
.last_mut()
|
|
||||||
.unwrap()
|
|
||||||
.habilitation_à_signer_un_lot =
|
|
||||||
String::from_utf8_lossy(field.content).to_string();
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
return Err(format!(
|
|
||||||
"Unknown (group, field) pair: ({}, {})",
|
|
||||||
group.id, field.id
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(carte_ps)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test_decode_carte_ps {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_francoise_pharmacien0052419() {
|
|
||||||
let bytes: &[u8] = &[
|
|
||||||
0, 1, 51, // Block 01, Content size 51
|
|
||||||
1, 48, // Field 01, Content size 1
|
|
||||||
1, 56, // Field 02, Content size 1
|
|
||||||
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // Field 03, Content size 11
|
|
||||||
1, 52, // Field 04, Content size 1
|
|
||||||
2, 50, 50, // Field 05, Content size 2
|
|
||||||
17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49,
|
|
||||||
57, // Field 06, Content size 17
|
|
||||||
9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // Field 07, Content size 9
|
|
||||||
1, 84, // Field 08, Content size 1
|
|
||||||
0, 2, 83, // Block 02, Content size 83
|
|
||||||
1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
|
||||||
80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
|
||||||
57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
|
||||||
48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
|
||||||
];
|
|
||||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
|
||||||
let carte_ps = decode_carte_ps(blocks).unwrap();
|
|
||||||
|
|
||||||
assert_eq!(carte_ps.titulaire.type_de_carte_ps, "0");
|
|
||||||
assert_eq!(carte_ps.titulaire.type_d_identification_nationale, "8");
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.titulaire.numero_d_identification_nationale,
|
|
||||||
"99700524194"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.titulaire.cle_du_numero_d_identification_nationale,
|
|
||||||
"4"
|
|
||||||
);
|
|
||||||
assert_eq!(carte_ps.titulaire.code_civilite, "22");
|
|
||||||
assert_eq!(carte_ps.titulaire.nom_du_ps, "PHARMACIEN0052419");
|
|
||||||
assert_eq!(carte_ps.titulaire.prenom_du_ps, "FRANCOISE");
|
|
||||||
assert_eq!(carte_ps.titulaire.categorie_carte, 'T');
|
|
||||||
|
|
||||||
assert_eq!(carte_ps.situations.len(), 1);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].numero_logique_de_la_situation_de_facturation_du_ps,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
assert_eq!(carte_ps.situations[0].mode_d_exercice, "0");
|
|
||||||
assert_eq!(carte_ps.situations[0].statut_d_exercice, "1");
|
|
||||||
assert_eq!(carte_ps.situations[0].secteur_d_activite, "86");
|
|
||||||
assert_eq!(carte_ps.situations[0].type_d_identification_structure, "1");
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].numero_d_identification_structure,
|
|
||||||
"0B0221958"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].cle_du_numero_d_identification_structure,
|
|
||||||
"8"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].raison_sociale_structure,
|
|
||||||
"PHARMACIE DU CENTRE22195"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].numero_d_identification_de_facturation_du_ps,
|
|
||||||
"00202419"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].cle_du_numero_d_identification_de_facturation_du_ps,
|
|
||||||
"8"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].numero_d_identification_du_ps_remplaçant,
|
|
||||||
""
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].cle_du_numero_d_identification_du_ps_remplaçant,
|
|
||||||
"0"
|
|
||||||
);
|
|
||||||
assert_eq!(carte_ps.situations[0].code_conventionnel, "1");
|
|
||||||
assert_eq!(carte_ps.situations[0].code_specialite, "50");
|
|
||||||
assert_eq!(carte_ps.situations[0].code_zone_tarifaire, "10");
|
|
||||||
assert_eq!(carte_ps.situations[0].code_zone_ik, "00");
|
|
||||||
assert_eq!(carte_ps.situations[0].code_agrement_1, "0");
|
|
||||||
assert_eq!(carte_ps.situations[0].code_agrement_2, "0");
|
|
||||||
assert_eq!(carte_ps.situations[0].code_agrement_3, "0");
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].habilitation_à_signer_une_facture,
|
|
||||||
"1"
|
|
||||||
);
|
|
||||||
assert_eq!(carte_ps.situations[0].habilitation_à_signer_un_lot, "1");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_multiple_situations() {
|
|
||||||
let bytes: &[u8] = &[
|
|
||||||
0, 1, 51, // Block 01, Content size 51
|
|
||||||
1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17, 80,
|
|
||||||
72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78, 67,
|
|
||||||
79, 73, 83, 69, 1, 84, 0, 2, 83, // Block 02, Content size 83
|
|
||||||
1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
|
||||||
80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
|
||||||
57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
|
||||||
48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 3,
|
|
||||||
83, // Block 03, Content size 83
|
|
||||||
1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
|
||||||
80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
|
||||||
57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
|
||||||
48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 0, 4,
|
|
||||||
83, // Block 04, Content size 83
|
|
||||||
1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56, 1, 56, 24,
|
|
||||||
80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69, 50, 50, 49,
|
|
||||||
57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53, 48, 2, 49,
|
|
||||||
48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
|
||||||
];
|
|
||||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
|
||||||
let carte_ps = decode_carte_ps(blocks).unwrap();
|
|
||||||
|
|
||||||
assert_eq!(carte_ps.situations.len(), 3);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[0].raison_sociale_structure,
|
|
||||||
"PHARMACIE DU CENTRE22195"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[1].raison_sociale_structure,
|
|
||||||
"PHARMACIE DU CENTRE22195"
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
carte_ps.situations[2].raison_sociale_structure,
|
|
||||||
"PHARMACIE DU CENTRE22195"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[should_panic]
|
|
||||||
fn test_missing_field() {
|
|
||||||
todo!();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[should_panic]
|
|
||||||
fn test_unknown_group_field_pair() {
|
|
||||||
todo!();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[should_panic]
|
|
||||||
fn test_invalid_field_format() {
|
|
||||||
todo!();
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,19 +0,0 @@
|
|||||||
pub mod cps;
|
|
||||||
pub mod libssv;
|
|
||||||
pub mod ssv_memory;
|
|
||||||
pub mod ssvlib_demo;
|
|
||||||
|
|
||||||
pub fn add(left: usize, right: usize) -> usize {
|
|
||||||
left + right
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn it_works() {
|
|
||||||
let result = add(2, 2);
|
|
||||||
assert_eq!(result, 4);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,23 +0,0 @@
|
|||||||
/// libssv.rs
|
|
||||||
///
|
|
||||||
/// Low level bindings to the SSVLIB dynamic library.
|
|
||||||
// TODO : look for creating a dedicated *-sys crate : https://kornel.ski/rust-sys-crate
|
|
||||||
use libc::{c_char, c_ushort, c_void, size_t};
|
|
||||||
|
|
||||||
#[cfg_attr(target_os = "linux", link(name = "ssvlux64"))]
|
|
||||||
#[cfg_attr(target_os = "windows", link(name = "ssvw64"))]
|
|
||||||
extern "C" {
|
|
||||||
pub fn SSV_InitLIB2(pcRepSesamIni: *const c_char) -> c_ushort;
|
|
||||||
pub fn SSV_LireCartePS(
|
|
||||||
NomRessourcePS: *const c_char,
|
|
||||||
NomRessourceLecteur: *const c_char,
|
|
||||||
CodePorteurPS: *const c_char,
|
|
||||||
ZDonneesSortie: *mut *mut c_void,
|
|
||||||
TTailleDonneesSortie: *mut size_t,
|
|
||||||
) -> c_ushort;
|
|
||||||
pub fn SSV_LireConfig(
|
|
||||||
ZDonneesSortie: *mut *mut c_void,
|
|
||||||
TTailleDonneesSortie: *mut size_t,
|
|
||||||
) -> c_ushort;
|
|
||||||
}
|
|
||||||
// TODO : replace void* by Rust struct : https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs
|
|
@ -1,8 +0,0 @@
|
|||||||
mod cps;
|
|
||||||
mod libssv;
|
|
||||||
mod ssv_memory;
|
|
||||||
mod ssvlib_demo;
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
ssvlib_demo::demo();
|
|
||||||
}
|
|
@ -1,283 +0,0 @@
|
|||||||
/// # SSV Memory
|
|
||||||
/// Provide functions to manipulate raw memory from SSV library.
|
|
||||||
use std::convert::TryFrom;
|
|
||||||
|
|
||||||
#[derive(PartialEq, Debug)]
|
|
||||||
struct ElementSize {
|
|
||||||
pub size: usize,
|
|
||||||
pub pad: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO : Est-ce qu'on pourrait/devrait définir un type custom pour représenter les tableaux de bytes ?
|
|
||||||
|
|
||||||
impl TryFrom<&[u8]> for ElementSize {
|
|
||||||
type Error = &'static str;
|
|
||||||
|
|
||||||
fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
|
|
||||||
if bytes.is_empty() {
|
|
||||||
return Err("Empty bytes input");
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut element_size = ElementSize { size: 0, pad: 1 };
|
|
||||||
// Longueur:
|
|
||||||
// - si le bit de poids fort du premier octet est à 0, la longueur est codée sur un octet
|
|
||||||
// - si le bit de poids fort du premier octet est à 1, les 7 bits de poids faible codent le nombre d'octets utilisés pour coder la longueur
|
|
||||||
if bytes[0] & 0b1000_0000 == 0 {
|
|
||||||
// Size coded on 1 byte
|
|
||||||
element_size.size = bytes[0] as usize;
|
|
||||||
} else {
|
|
||||||
// Size coded on N bytes
|
|
||||||
// N are the 7 lower bits of the first byte
|
|
||||||
let size_bytes_len = (bytes[0] & 0b0111_1111) as usize;
|
|
||||||
if size_bytes_len > bytes.len() - 1 {
|
|
||||||
return Err("Invalid memory: not enough bytes to read the size");
|
|
||||||
} else if size_bytes_len > 4 {
|
|
||||||
return Err("Invalid memory: size is too big");
|
|
||||||
}
|
|
||||||
let size_bytes = &bytes[1..1 + size_bytes_len];
|
|
||||||
|
|
||||||
// u32::from_be_bytes() requires a 4 bytes array
|
|
||||||
let mut padded_bytes = [0u8; 4];
|
|
||||||
padded_bytes[size_bytes_len..].copy_from_slice(size_bytes);
|
|
||||||
|
|
||||||
element_size.size = u32::from_be_bytes(padded_bytes) as usize;
|
|
||||||
element_size.pad += size_bytes_len;
|
|
||||||
}
|
|
||||||
Ok(element_size)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Block<'a> {
|
|
||||||
pub id: u16,
|
|
||||||
pub size: usize,
|
|
||||||
pub content: Vec<Field<'a>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> From<&'a [u8]> for Block<'a> {
|
|
||||||
fn from(bytes: &'a [u8]) -> Self {
|
|
||||||
let mut offset = 0;
|
|
||||||
let id = u16::from_be_bytes(bytes[..2].try_into().unwrap());
|
|
||||||
offset += 2;
|
|
||||||
let ElementSize {
|
|
||||||
size: block_size,
|
|
||||||
pad,
|
|
||||||
} = bytes[2..].try_into().unwrap();
|
|
||||||
offset += pad;
|
|
||||||
let raw_content = &bytes[offset..];
|
|
||||||
let mut field_offset = 0;
|
|
||||||
// While there is still content to read, parse Fields
|
|
||||||
let mut content = Vec::new();
|
|
||||||
let mut field_id = 1;
|
|
||||||
while field_offset < block_size {
|
|
||||||
let mut field: Field<'a> = raw_content[field_offset..].into();
|
|
||||||
field.id = field_id;
|
|
||||||
field_offset += field.size;
|
|
||||||
field_id += 1;
|
|
||||||
content.push(field);
|
|
||||||
}
|
|
||||||
Block {
|
|
||||||
id,
|
|
||||||
size: offset + block_size,
|
|
||||||
content,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Field<'a> {
|
|
||||||
pub id: u16,
|
|
||||||
pub size: usize,
|
|
||||||
pub content: &'a [u8],
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> From<&'a [u8]> for Field<'a> {
|
|
||||||
fn from(bytes: &'a [u8]) -> Self {
|
|
||||||
let ElementSize { size, pad } = bytes.try_into().unwrap();
|
|
||||||
let contenu = &bytes[pad..pad + size];
|
|
||||||
Field {
|
|
||||||
id: 0,
|
|
||||||
size: pad + size,
|
|
||||||
content: contenu,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn decode_ssv_memory(bytes: &[u8], size: usize) -> Vec<Block> {
|
|
||||||
let mut blocks: Vec<Block> = Vec::new();
|
|
||||||
let mut offset = 0;
|
|
||||||
while offset < size {
|
|
||||||
let block: Block = bytes[offset..].into();
|
|
||||||
offset += block.size;
|
|
||||||
blocks.push(block);
|
|
||||||
}
|
|
||||||
blocks
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test_element_size {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn short_size() {
|
|
||||||
let bytes: &[u8] = &[0b_0000_0001_u8];
|
|
||||||
let element_size: ElementSize = bytes.try_into().unwrap();
|
|
||||||
assert_eq!(element_size.size, 1);
|
|
||||||
assert_eq!(element_size.pad, 1);
|
|
||||||
|
|
||||||
let bytes: &[u8] = &[0b_0100_0000_u8];
|
|
||||||
let element_size: ElementSize = bytes.try_into().unwrap();
|
|
||||||
assert_eq!(element_size.size, 64);
|
|
||||||
assert_eq!(element_size.pad, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn long_size() {
|
|
||||||
let bytes: &[u8] = &[0b_1000_0010_u8, 0b_0000_0001_u8, 0b_0100_0000_u8];
|
|
||||||
let element_size: ElementSize = bytes.try_into().unwrap();
|
|
||||||
assert_eq!(element_size.size, 320);
|
|
||||||
assert_eq!(element_size.pad, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn null_size() {
|
|
||||||
let bytes: &[u8] = &[];
|
|
||||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
|
||||||
assert_eq!(result, Err("Empty bytes input"),);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn invalid_memory() {
|
|
||||||
let bytes: &[u8] = &[0b_1000_0001_u8];
|
|
||||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
|
||||||
assert_eq!(
|
|
||||||
result,
|
|
||||||
Err("Invalid memory: not enough bytes to read the size"),
|
|
||||||
);
|
|
||||||
|
|
||||||
let bytes: &[u8] = &[0b_1000_0010_u8, 1];
|
|
||||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
|
||||||
assert_eq!(
|
|
||||||
result,
|
|
||||||
Err("Invalid memory: not enough bytes to read the size"),
|
|
||||||
);
|
|
||||||
|
|
||||||
let bytes: &[u8] = &[0b_1000_0101_u8, 1, 1, 1, 1, 1];
|
|
||||||
let result: Result<ElementSize, &str> = bytes.try_into();
|
|
||||||
assert_eq!(result, Err("Invalid memory: size is too big"),);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test_field {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn short_size() {
|
|
||||||
let bytes: &[u8] = &[
|
|
||||||
51, 1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, 1, 52, 2, 50, 50, 17,
|
|
||||||
80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, 9, 70, 82, 65, 78,
|
|
||||||
67, 79, 73, 83, 69, 1, 84,
|
|
||||||
];
|
|
||||||
let element: Field = bytes.into();
|
|
||||||
assert_eq!(element.size, 52);
|
|
||||||
assert_eq!(element.content[..5], [1, 48, 1, 56, 11]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn long_size() {
|
|
||||||
let mut bytes_vec = vec![
|
|
||||||
0b_1000_0010_u8,
|
|
||||||
0b_0000_0001_u8,
|
|
||||||
0b_0000_0000_u8, // size = 256
|
|
||||||
];
|
|
||||||
// Add 256 bytes to the content
|
|
||||||
bytes_vec.append(&mut vec![1; 256]);
|
|
||||||
let bytes: &[u8] = &bytes_vec;
|
|
||||||
let element: Field = bytes.into();
|
|
||||||
assert_eq!(element.size, 259);
|
|
||||||
assert_eq!(element.content.len(), 256);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test_block {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_francoise_pharmacien0052419_partial_block_1() {
|
|
||||||
let bytes: &[u8] = &[1, 48, 1, 56, 11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52];
|
|
||||||
|
|
||||||
let field1: Field = bytes.into();
|
|
||||||
assert_eq!(field1.size, 2);
|
|
||||||
assert_eq!(field1.content, &[48]);
|
|
||||||
|
|
||||||
let field2: Field = bytes[field1.size..].into();
|
|
||||||
assert_eq!(field2.size, 2);
|
|
||||||
assert_eq!(field2.content, &[56]);
|
|
||||||
|
|
||||||
let field3: Field = bytes[field1.size + field2.size..].into();
|
|
||||||
assert_eq!(field3.size, 12);
|
|
||||||
assert_eq!(
|
|
||||||
field3.content,
|
|
||||||
&[57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_francoise_pharmacien0052419() {
|
|
||||||
let bytes: &[u8] = &[
|
|
||||||
0, 1, 51, // 3
|
|
||||||
1, 48, // 2
|
|
||||||
1, 56, // 2
|
|
||||||
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
|
|
||||||
1, 52, // 2
|
|
||||||
2, 50, 50, // 3
|
|
||||||
17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
|
|
||||||
9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
|
|
||||||
1, 84, // 2
|
|
||||||
// total: 54
|
|
||||||
0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
|
|
||||||
1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
|
|
||||||
50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
|
|
||||||
48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
|
||||||
];
|
|
||||||
|
|
||||||
let first_block: Block = bytes.into();
|
|
||||||
assert_eq!(first_block.id, 1);
|
|
||||||
assert_eq!(first_block.size, 54);
|
|
||||||
assert_eq!(first_block.content.len(), 8);
|
|
||||||
|
|
||||||
let second_block: Block = bytes[first_block.size..].into();
|
|
||||||
assert_eq!(second_block.id, 2);
|
|
||||||
assert_eq!(second_block.size, 86);
|
|
||||||
assert_eq!(second_block.content.len(), 21);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test_decode_ssv_memory {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_francoise_pharmacien0052419() {
|
|
||||||
let bytes: &[u8] = &[
|
|
||||||
0, 1, 51, // 3
|
|
||||||
1, 48, // 2
|
|
||||||
1, 56, // 2
|
|
||||||
11, 57, 57, 55, 48, 48, 53, 50, 52, 49, 57, 52, // 12
|
|
||||||
1, 52, // 2
|
|
||||||
2, 50, 50, // 3
|
|
||||||
17, 80, 72, 65, 82, 77, 65, 67, 73, 69, 78, 48, 48, 53, 50, 52, 49, 57, // 18
|
|
||||||
9, 70, 82, 65, 78, 67, 79, 73, 83, 69, // 10
|
|
||||||
1, 84, // 2
|
|
||||||
// total: 54
|
|
||||||
0, 2, 83, 1, 1, 1, 48, 1, 49, 2, 56, 54, 1, 49, 9, 48, 66, 48, 50, 50, 49, 57, 53, 56,
|
|
||||||
1, 56, 24, 80, 72, 65, 82, 77, 65, 67, 73, 69, 32, 68, 85, 32, 67, 69, 78, 84, 82, 69,
|
|
||||||
50, 50, 49, 57, 53, 8, 48, 48, 50, 48, 50, 52, 49, 57, 1, 56, 0, 1, 48, 1, 49, 2, 53,
|
|
||||||
48, 2, 49, 48, 2, 48, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49,
|
|
||||||
];
|
|
||||||
let blocks = decode_ssv_memory(bytes, bytes.len());
|
|
||||||
assert_eq!(blocks.len(), 2);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
/// High level API for the SSV library,
|
|
||||||
/// based on the low level bindings in libssv.rs.
|
|
||||||
extern crate dotenv;
|
|
||||||
use libc::{c_void, size_t};
|
|
||||||
use std::env;
|
|
||||||
use std::ffi::CString;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::ptr;
|
|
||||||
|
|
||||||
use crate::cps::lire_carte;
|
|
||||||
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
|
||||||
|
|
||||||
fn ssv_init_lib_2() {
|
|
||||||
let ini_str = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
|
||||||
let ini = CString::new(ini_str).expect("CString::new failed");
|
|
||||||
unsafe {
|
|
||||||
let result = SSV_InitLIB2(ini.as_ptr());
|
|
||||||
println!("SSV_InitLIB2 result: {}", result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn ssv_lire_config() {
|
|
||||||
let mut buffer: *mut c_void = ptr::null_mut();
|
|
||||||
let mut size: size_t = 0;
|
|
||||||
unsafe {
|
|
||||||
let result = SSV_LireConfig(&mut buffer, &mut size);
|
|
||||||
println!("SSV_LireConfig result: {}", result);
|
|
||||||
|
|
||||||
if !buffer.is_null() {
|
|
||||||
let hex_values = std::slice::from_raw_parts(buffer as *const u8, size);
|
|
||||||
for &byte in hex_values {
|
|
||||||
print!("{:02X} ", byte);
|
|
||||||
}
|
|
||||||
println!();
|
|
||||||
|
|
||||||
libc::free(buffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn demo() {
|
|
||||||
// TODO : this is probably not working on release, because I'm not sure it exists a CARGO_MANIFEST_DIR and so it can find the `.env`
|
|
||||||
// Maybe we could use a system standard config path to store a config file
|
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
|
|
||||||
let manifest_path = PathBuf::from(manifest_dir);
|
|
||||||
dotenv::from_path(manifest_path.join(".env")).ok();
|
|
||||||
|
|
||||||
println!("------- Demo for the SSV library --------");
|
|
||||||
|
|
||||||
ssv_init_lib_2();
|
|
||||||
|
|
||||||
let code_pin = "1234";
|
|
||||||
let lecteur = "HID Global OMNIKEY 3x21 Smart Card Reader 0";
|
|
||||||
let carte_ps = lire_carte(code_pin, lecteur).unwrap();
|
|
||||||
println!("CartePS: {:#?}", carte_ps);
|
|
||||||
|
|
||||||
ssv_lire_config();
|
|
||||||
|
|
||||||
println!("-----------------------------------------");
|
|
||||||
}
|
|
BIN
lib/libp4pillondebuglib.a
Normal file
BIN
lib/p4pillondebuglib.lib
Normal file
BIN
lib/p4pillondebuglib.o
Normal file
BIN
lib/p4pillondebuglib.obj
Normal file
BIN
lib/ssvw64.exp
Normal file
36
make.bat
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
@echo off
|
||||||
|
rem Set variables
|
||||||
|
set SRC_DIR=src
|
||||||
|
set LIB_DIR=lib
|
||||||
|
|
||||||
|
rem Create the %LIB_DIR% directory if it does not exist
|
||||||
|
if not exist %LIB_DIR% mkdir %LIB_DIR%
|
||||||
|
|
||||||
|
if "%1"=="/clean" (
|
||||||
|
goto clean
|
||||||
|
)
|
||||||
|
|
||||||
|
rem Configure the environment for Visual Studio
|
||||||
|
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||||
|
|
||||||
|
rem Build %SRC_DIR%\*.c files
|
||||||
|
cl /c /Fd:%LIB_DIR%\ /Fo:%LIB_DIR%\ /Iinclude\ /I%SRC_DIR%\ %SRC_DIR%\*.c
|
||||||
|
|
||||||
|
rem Link the object files into a static library
|
||||||
|
lib %LIB_DIR%\*.obj
|
||||||
|
|
||||||
|
rem Create a ssvw64.lib file from a ssvw64.def file
|
||||||
|
lib /def:%SRC_DIR%\ssvw64.def /out:%LIB_DIR%\ssvw64.lib /machine:x64
|
||||||
|
|
||||||
|
rem Build complete
|
||||||
|
pause
|
||||||
|
exit /b 0
|
||||||
|
|
||||||
|
:clean
|
||||||
|
del %LIB_DIR%\*.obj
|
||||||
|
del %LIB_DIR%\*.lib
|
||||||
|
del %LIB_DIR%\*.exp
|
||||||
|
|
||||||
|
rem Clean complete
|
||||||
|
pause
|
||||||
|
exit /b 0
|