[Rust] Task 2 is complete

Author: TrifanBogdan24

rust-method/src/queries/delete.rs

@@ -1,3 +1,4 @@
+use crate::task1::calculeaza_medii_generale;
 use crate::Secretariat;
 use crate::Student;
 use crate::Materie;
@@ -156,6 +157,7 @@ pub fn delete(s: &mut Secretariat, query: &str) -> Result<(), String> {
         }
         "inrolari" => {
             delete_from_table(&mut s.inrolari, &conditii)?;
+            calculeaza_medii_generale(s);
             Ok(())
         }
         _ => Err(format!(

rust-method/src/queries/select.rs

@@ -18,7 +18,9 @@ impl Selectable for Student {
             "nume" => print!("{}", self.nume),
             "an_studiu" => print!("{}", self.an_studiu),
             "statut" => print!("{}", self.statut),
-            "medie_generala" => print!("{:.2}", self.medie_generala),
+            "medie_generala" =>
+                print!("{:.2}", 
+                    (self.medie_generala * 100.0f32).round() as f32 / 100.0f32),
             _ => return Err(format!("Camp invalid {:?}", field)),
         }
         Ok(())

rust-method/src/queries/update.rs

@@ -23,7 +23,7 @@ impl Updateable for Student {
                     .map_err(|_| format!("ID invalid: {:?}", value))?,
             "nume" =>
                 self.nume = value.to_string(),
-            "an studiu" =>
+            "an_studiu" =>
                 self.an_studiu = value
                     .parse::<u8>()
                     .map_err(|_| format!("An studiu invalid: {:?}", value))?,
@@ -35,7 +35,9 @@ impl Updateable for Student {
                 }
             }
             "medie_generala" =>
-                return Err("Buna incercare :) NU poti modifica media generala!".to_string()),
+                self.medie_generala = value
+                    .parse::<f32>()
+                    .map_err(|_| format!("Medie invalida: {:?}", value))?,
             _ =>
                 return Err(format!("Camp invalid {:?}", field))
         }
@@ -170,6 +172,7 @@ pub fn update(s: &mut Secretariat, query: &str) -> Result<(), String> {
         str_conditii.pop();
     }
 
+
     // Aici poti sa folosesti deja `nume_tabela`, `camp`, `valoare` si `str_conditii`
     // exemplu: parseaza conditii
     let conditii = parseaza_conditiile_where(&str_conditii)?;

rust-method/src/queries/where_clause.rs

@@ -181,7 +181,7 @@ fn match_inrolare_on_conditie(inrolare: &Inrolare, cond: &Conditie) -> Result<bo
         "id_student" =>
             return match_num_on_conditie(inrolare.id_student, cond),
         "id_materie" =>
-            return match_num_on_conditie(inrolare.id_student, cond),
+            return match_num_on_conditie(inrolare.id_materie, cond),
         "note" => {
             let mut tokens = cond.valoare.split_whitespace();
 

rust-method/src/task1.rs

@@ -155,14 +155,18 @@ pub fn calculeaza_medii_generale(s: &mut Secretariat) -> () {
             idx_inrolare += 1;
         }
 
-        student.medie_generala = suma_notelor / (nr_materii as f32);
+        student.medie_generala = if nr_materii != 0 {
+            suma_notelor / (nr_materii as f32)
+        } else {
+            0.0
+        }
     }
 }
 
 pub fn citeste_secretariat(nume_fisier: &str) -> Secretariat {
     let mut secretariat = Secretariat::default();
     let file = File::open(nume_fisier).unwrap_or_else(|_| {
-        eprintln!("Eroare: nu pot deschide fișierul {:?}", nume_fisier);
+        eprintln!("Eroare la deschiderea fisierului {:?}", nume_fisier);
         process::exit(255);
     });