fernando/eeg_certs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BE][Scans] Fix UI error with certs with only DNI. Add unix timestamp to the names of the PDF generated

Browse Source
This commit is contained in:
Araozu 2023-11-16 12:24:57 -05:00
parent 0fe2c53ffd
commit 811f60fa0e
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/controller/scans/mod.rs
View File

@ -142,8 +142,7 @@ fn get_details_from_paths(paths: Vec<PathBuf>) -> Vec<(PathBuf, ScanInfo)> {
fn get_image_info(path: PathBuf) -> ScanInfo { fn get_image_info(path: PathBuf) -> ScanInfo {
let img = image::open(&path).unwrap(); let img = image::open(&path).unwrap();
// get unix timestamp now // get unix timestamp now in ms
// Get current time in seconds
let current_time = SystemTime::now().duration_since(UNIX_EPOCH); let current_time = SystemTime::now().duration_since(UNIX_EPOCH);
let current_time = match current_time { let current_time = match current_time {
Ok(t) => t, Ok(t) => t,
@ -250,7 +249,7 @@ async fn convert_scans_from_data(data: &Vec<(PathBuf, ScanInfo)>) -> Result<(),
); );
let register_id_list = ids.join(","); let register_id_list = ids.join(",");
let person_dni_list = dnis.join("-"); let person_dni_list = dnis.join(",");
log::info!("register_id_list: {}", register_id_list); log::info!("register_id_list: {}", register_id_list);
log::info!("person_dni_list: {}", person_dni_list); log::info!("person_dni_list: {}", person_dni_list);
@ -298,12 +297,23 @@ async fn convert_scans_from_data(data: &Vec<(PathBuf, ScanInfo)>) -> Result<(),
} }
}; };
let current_time = SystemTime::now().duration_since(UNIX_EPOCH);
let current_time = match current_time {
Ok(t) => t,
Err(err) => {
log::error!("Error obteniendo hora actual: {:?}", err);
continue;
}
};
let current_ms = current_time.as_millis();
let filename = format!( let filename = format!(
"{} {} {} - {} [{:X}].pdf", "{} {} {} - {} [{}][{:X}].pdf",
person_info.person_names, person_info.person_names,
person_info.person_paternal_surname, person_info.person_paternal_surname,
person_info.person_maternal_surname, person_info.person_maternal_surname,
person_info.course_name, person_info.course_name,
current_ms,
person_info.register_id, person_info.register_id,
); );

2
backend/src/model/register.rs
View File

@ -195,7 +195,7 @@ impl Register {
select select
'' as 'course_name', '' as 'course_name',
0 as register_id, 0 as register_id,
'' as person_dni, person.person_dni,
person.person_names, person.person_names,
person.person_paternal_surname, person.person_paternal_surname,
person.person_maternal_surname person.person_maternal_surname

2
frontend/src/Scans/index.tsx
View File

@ -23,7 +23,7 @@ function dataFromScanResult(result: ScanResult) {
if ("Full" in result) { if ("Full" in result) {
return `DNI: ${result.Full[0]}, iid: ${result.Full[1]}`; return `DNI: ${result.Full[0]}, iid: ${result.Full[1]}`;
} else if ("Partial" in result) { } else if ("Partial" in result) {
return `DNI: ${result.Partial}`; return `DNI: ${result.Partial[0]}`;
} else if ("Error" in result) { } else if ("Error" in result) {
return `Error: ${result.Error}`; return `Error: ${result.Error}`;
} }