@@ -160,16 +160,21 @@ std::string Passenger::getLuggage()
160160// overloaded output function for Worker class
161161void Passenger::outputPass (Passenger &el)
162162{
163- std::cout << " --------------------------------------------------------------"
164- << " Name & surname: " getName () << ' '
165- << el.getSurname () << std::endl
166- << " Age: " getAge () << std::endl
167- << " Sex: " getSex () << std::endl
168- << " Luggage: " getLuggage () << std::endl
169- << " Route: " getRoute () << std::endl
170- << " Day of departure: " getDepDate () << std::endl
171- << " Day of departure abroad: " getDepAbroadDate () << std::endl
172- << " --------------------------------------------------------------"
163+ std::cout << " _____________________________________________________________"
164+ << " | Name & surname: " getName () << ' ' getSurname () << std::endl
165+ << " |_____________________________________________________________"
166+ << " | Age: " getAge () << std::endl
167+ << " |_____________________________________________________________"
168+ << " | Sex: " getSex () << std::endl
169+ << " |_____________________________________________________________"
170+ << " | Luggage: " getLuggage () << std::endl
171+ << " |_____________________________________________________________"
172+ << " | Route: " getRoute () << std::endl
173+ << " |_____________________________________________________________"
174+ << " | Day of departure: " getDepDate () << std::endl
175+ << " |_____________________________________________________________"
176+ << " | Day of departure abroad: " getDepAbroadDate () << std::endl
177+ << " |_____________________________________________________________"
173178}
174179
175180
@@ -241,17 +246,23 @@ std::string Worker::getDepartment()
241246// overloaded output function for Worker class
242247void Worker::output (Worker &el)
243248{
244- std::cout << " --------------------------------------------------------------"
245- << " Name & surname: " getName () << ' '
246- << el.getSurname () << std::endl
247- << " Age: " getAge () << std::endl
248- << " Sex: " getSex () << std::endl
249- << " Num. of children: " getNumOfChildren () << std::endl
250- << " Presence of children(0-no; 1-yes): " getThePresenceOfChildren () << std::endl
251- << " Salary: " getSalary () << std::endl
252- << " Experience: " getExperience () << std::endl
253- << " Department: " getDepartment () << std::endl
254- << " --------------------------------------------------------------"
249+ std::cout << " _____________________________________________________________"
250+ << " | Name & surname: " getName () << ' ' getSurname () << std::endl
251+ << " |_____________________________________________________________"
252+ << " | Age: " getAge () << std::endl
253+ << " |_____________________________________________________________"
254+ << " | Sex: " getSex () << std::endl
255+ << " |_____________________________________________________________"
256+ << " | Num. of children: " getNumOfChildren () << std::endl
257+ << " |_____________________________________________________________"
258+ << " | Presence of children(0-no; 1-yes): " getThePresenceOfChildren () << std::endl
259+ << " |_____________________________________________________________"
260+ << " | Salary: " getSalary () << std::endl
261+ << " |_____________________________________________________________"
262+ << " | Experience: " getExperience () << std::endl
263+ << " |_____________________________________________________________"
264+ << " | Department: " getDepartment () << std::endl
265+ << " |_____________________________________________________________"
255266}
256267
257268
@@ -296,18 +307,25 @@ std::string Administration::getPosition()
296307// overloaded output function for the Administration class
297308void Administration::output (Administration &el)
298309{
299- std::cout << " --------------------------------------------------------------"
300- << " Name & surname: " getName () << ' '
301- << el.getSurname () << std::endl
302- << " Age: " getAge () << std::endl
303- << " Sex: " getSex () << std::endl
304- << " Num. of children: " getNumOfChildren () << std::endl
305- << " Presence of children(0-no; 1-yes): " getThePresenceOfChildren () << std::endl
306- << " Salary: " getSalary () << std::endl
307- << " Experience: " getExperience () << std::endl
308- << " Department: " getDepartment () << std::endl
309- << " Position: " getPosition () << std::endl
310- << " --------------------------------------------------------------"
310+ std::cout << " _____________________________________________________________"
311+ << " | Name & surname: " getName () << ' ' getSurname () << std::endl
312+ << " |_____________________________________________________________"
313+ << " | Age: " getAge () << std::endl
314+ << " |_____________________________________________________________"
315+ << " | Sex: " getSex () << std::endl
316+ << " |_____________________________________________________________"
317+ << " | Num. of children: " getNumOfChildren () << std::endl
318+ << " |_____________________________________________________________"
319+ << " | Presence of children(0-no; 1-yes): " getThePresenceOfChildren () << std::endl
320+ << " |_____________________________________________________________"
321+ << " | Salary: " getSalary () << std::endl
322+ << " |_____________________________________________________________"
323+ << " | Experience: " getExperience () << std::endl
324+ << " |_____________________________________________________________"
325+ << " | Department: " getDepartment () << std::endl
326+ << " |_____________________________________________________________"
327+ << " | Position: " getPosition () << std::endl
328+ << " |_____________________________________________________________"
311329}
312330
313331
@@ -352,18 +370,25 @@ int Rolling_stock_driver::getYearOfMed()
352370// overloaded output function for the Rolling_stock_driver class
353371void Rolling_stock_driver::output (Rolling_stock_driver &el)
354372{
355- std::cout << " --------------------------------------------------------------"
356- << " Name & surname: " getName () << ' '
357- << el.getSurname () << std::endl
358- << " Age: " getAge () << std::endl
359- << " Sex: " getSex () << std::endl
360- << " Num. of children: " getNumOfChildren () << std::endl
361- << " Presence of children(0-no; 1-yes): " getThePresenceOfChildren () << std::endl
362- << " Salary: " getSalary () << std::endl
363- << " Experience: " getExperience () << std::endl
364- << " Department: " getDepartment () << std::endl
365- << " Year of med. ex.: " getYearOfMed () << std::endl
366- << " --------------------------------------------------------------"
373+ std::cout << " _____________________________________________________________"
374+ << " | Name & surname: " getName () << ' ' getSurname () << std::endl
375+ << " |_____________________________________________________________"
376+ << " | Age: " getAge () << std::endl
377+ << " |_____________________________________________________________"
378+ << " | Sex: " getSex () << std::endl
379+ << " |_____________________________________________________________"
380+ << " | Num. of children: " getNumOfChildren () << std::endl
381+ << " |_____________________________________________________________"
382+ << " | Presence of children(0-no; 1-yes): " getThePresenceOfChildren () << std::endl
383+ << " |_____________________________________________________________"
384+ << " | Salary: " getSalary () << std::endl
385+ << " |_____________________________________________________________"
386+ << " | Experience: " getExperience () << std::endl
387+ << " |_____________________________________________________________"
388+ << " | Department: " getDepartment () << std::endl
389+ << " |_____________________________________________________________"
390+ << " | Year of med. ex.: " getYearOfMed () << std::endl
391+ << " |_____________________________________________________________"
367392}
368393
369394
@@ -566,43 +591,69 @@ int Train::getTotalNumOfTickets()
566591// output function for the "Locomotive" class
567592void Locomotive::outputLoc (Locomotive &el)
568593{
569- std::cout << " --------------------------------------------------------------"
570- << " Serial number: " getSerialNum () << std::endl
571- << " Workspace number: " getWorkspaceNum () << std::endl
572- << " Production date: " getDateOfProd () << std::endl
573- << " Max. speed: " getMaxSpeed () << std::endl
574- << " Brand: " getBrand () << std::endl
575- << " Fuel: " getFuel () << std::endl
576- << " Num. of routes: " getNumOfRoutes () << std::endl
577- << " Num. of routes before repair: " getNumOfRoutesBeforeRepair () << std::endl
578- << " Num. of repair: " getNumOfRepair () << std::endl
579- << " Date of come back: " getDateOfComeback () << std::endl
580- << " Days on station: " getDaysOnStation () << std::endl
581- << " Year of tech. exam: " getYearOfTechExam () << std::endl
582- << " Route status: " getRouteStatus () << std::endl
583- << " Route reason: " getRouteReason () << std::endl
584- << " Category: " getCategory () << std::endl
585- << " Route duration: " getRouteDuration () << std::endl
586- << " Route: " getRoute () << std::endl
587- << " Num. of handed tickets: " getNumOfHandedTickets () << std::endl
588- << " --------------------------------------------------------------"
594+ std::cout << " _____________________________________________________________"
595+ << " | Serial number: " getSerialNum () << std::endl
596+ << " |_____________________________________________________________"
597+ << " | Workspace number: " getWorkspaceNum () << std::endl
598+ << " |_____________________________________________________________"
599+ << " | Production date: " getDateOfProd () << std::endl
600+ << " |_____________________________________________________________"
601+ << " | Max. speed: " getMaxSpeed () << std::endl
602+ << " |_____________________________________________________________"
603+ << " | Brand: " getBrand () << std::endl
604+ << " |_____________________________________________________________"
605+ << " | Fuel: " getFuel () << std::endl
606+ << " |_____________________________________________________________"
607+ << " | Num. of routes: " getNumOfRoutes () << std::endl
608+ << " |_____________________________________________________________"
609+ << " | Num. of routes before repair: " getNumOfRoutesBeforeRepair () << std::endl
610+ << " |_____________________________________________________________"
611+ << " | Num. of repair: " getNumOfRepair () << std::endl
612+ << " |_____________________________________________________________"
613+ << " | Date of come back: " getDateOfComeback () << std::endl
614+ << " |_____________________________________________________________"
615+ << " | Days on station: " getDaysOnStation () << std::endl
616+ << " |_____________________________________________________________"
617+ << " | Year of tech. exam: " getYearOfTechExam () << std::endl
618+ << " |_____________________________________________________________"
619+ << " | Route status: " getRouteStatus () << std::endl
620+ << " |_____________________________________________________________"
621+ << " | Route reason: " getRouteReason () << std::endl
622+ << " |_____________________________________________________________"
623+ << " | Category: " getCategory () << std::endl
624+ << " |_____________________________________________________________"
625+ << " | Route duration: " getRouteDuration () << std::endl
626+ << " |_____________________________________________________________"
627+ << " | Route: " getRoute () << std::endl
628+ << " |_____________________________________________________________"
629+ << " | Num. of handed tickets: " getNumOfHandedTickets () << std::endl
630+ << " |_____________________________________________________________"
589631}
590632
591633// output function for the "Vagon" class
592634void Vagon::outputVag (Vagon &el)
593635{
594- std::cout << " --------------------------------------------------------------"
595- << " Serial number: " getSerialNum () << std::endl
596- << " Workspace number: " getWorkspaceNum () << std::endl
597- << " Production date: " getDateOfProd () << std::endl
598- << " Brand: " getBrand () << std::endl
599- << " Num. of routes: " getNumOfRoutes () << std::endl
600- << " Num. of routes before repair: " getNumOfRoutesBeforeRepair () << std::endl
601- << " Num. of repair: " getNumOfRepair () << std::endl
602- << " Date of come back: " getDateOfComeback () << std::endl
603- << " Days on station: " getDaysOnStation () << std::endl
604- << " Year of tech. exam: " getYearOfTechExam () << std::endl
605- << " --------------------------------------------------------------"
636+ std::cout << " _____________________________________________________________"
637+ << " | Serial number: " getSerialNum () << std::endl
638+ << " |_____________________________________________________________"
639+ << " | Workspace number: " getWorkspaceNum () << std::endl
640+ << " |_____________________________________________________________"
641+ << " | Production date: " getDateOfProd () << std::endl
642+ << " |_____________________________________________________________"
643+ << " | Brand: " getBrand () << std::endl
644+ << " |_____________________________________________________________"
645+ << " | Num. of routes: " getNumOfRoutes () << std::endl
646+ << " |_____________________________________________________________"
647+ << " | Num. of routes before repair: " getNumOfRoutesBeforeRepair () << std::endl
648+ << " |_____________________________________________________________"
649+ << " | Num. of repair: " getNumOfRepair () << std::endl
650+ << " |_____________________________________________________________"
651+ << " | Date of come back: " getDateOfComeback () << std::endl
652+ << " |_____________________________________________________________"
653+ << " | Days on station: " getDaysOnStation () << std::endl
654+ << " |_____________________________________________________________"
655+ << " | Year of tech. exam: " getYearOfTechExam () << std::endl
656+ << " |_____________________________________________________________"
606657}
607658
608659
0 commit comments