Changes between Version 1 and Version 2 of UseCase5


Ignore:
Timestamp:
02/11/25 01:07:17 (3 weeks ago)
Author:
212054
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UseCase5

    v1 v2  
    77
    88{{{
    9 CREATE PROCEDURE GetPodizveduvacDetails(IN input_Podizveduvac_Ime VARCHAR(50))
     9CREATE PROCEDURE GetPodizveduvacDetails(IN UID_p INT)
    1010BEGIN
    1111    SELECT
     
    1515        p.Saatnica AS Hourly_Rate
    1616    FROM Podizveduvac p
    17     WHERE p.Podizveduvac_Ime = input_Podizveduvac_Ime;
     17    WHERE p.UID_p = UID_p;
    1818
    1919    SELECT
     
    2323    FROM Raboti_Za rz
    2424    JOIN Rabotnik r ON rz.Maticen_br = r.Maticen_br
    25     WHERE rz.Podizveduvac_Ime = input_Podizveduvac_Ime;
     25    WHERE rz.UID_p = UID_p;
    2626
    2727    SELECT
     
    2929        o.Tip AS Objekt_Type,
    3030        o.Adresa AS Objekt_Address,
    31         TIMESTAMPDIFF(HOUR, FROM_UNIXTIME(rn.Od_vreme), FROM_UNIXTIME(rn.Do_vreme)) AS Total_Hours_Worked,
    32         TIMESTAMPDIFF(HOUR, FROM_UNIXTIME(rn.Od_vreme), FROM_UNIXTIME(rn.Do_vreme)) * p.Saatnica AS Total_Payments
     31        TIMESTAMPDIFF(HOUR, DATE_FORMAT(rn.Od_vreme, '%Y-%m-%d'), DATE_FORMAT(rn.Do_vreme, '%Y-%m-%d')) AS Total_Hours_Worked,
     32        TIMESTAMPDIFF(HOUR, DATE_FORMAT(rn.Od_vreme, '%Y-%m-%d'), DATE_FORMAT(rn.Do_vreme, '%Y-%m-%d')) * p.Saatnica AS Total_Payments
    3333    FROM Raboti_Na rn
    3434    JOIN Objekt o ON rn.Objekt_ID = o.Objekt_ID
    35     JOIN Podizveduvac p ON rn.Podizveduvac_Ime = p.Podizveduvac_Ime
    36     WHERE rn.Podizveduvac_Ime = input_Podizveduvac_Ime;
     35    JOIN Podizveduvac p ON rn.UID_p = p.UID
     36    WHERE rn.UID_p = UID_p;
    3737
    3838    SELECT
    3939        n.Nabavka_ID,
    40         n.Datum AS Request_Date,
     40        DATE_FORMAT(n.Datum, '%Y-%m-%d') AS Request_Date,
    4141        n.Cena AS Cost,
    4242        n.Kolicina AS Quantity,
     
    4444    FROM Pobaruva pb
    4545    JOIN Nabavka n ON pb.Nabavka_ID = n.Nabavka_ID
    46     WHERE pb.Podizveduvac_Ime = input_Podizveduvac_Ime;
    47 END
     46    WHERE pb.UID_p = UID_p;
     47END;
    4848}}}