From 667b1b89f89bb5701f70d5d3dcb6c4854b74e630 Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 29 Feb 2020 22:51:20 +0000 Subject: [PATCH 1/2] #114 _1 --- src/.gitignore | 1 + .../Controllers/OrganisationController.php | 0 .../Http/Controllers/VolunteerController.php | 105 ++++++++++++------ src/app/Rules/Cnp.php | 6 +- src/app/Rules/VolunteerEmail.php | 52 +++++++++ src/artisan | 0 src/bootstrap/cache/.gitignore | 0 src/database/migrations/v_1_0_0.php | 0 src/public/uploads/Book2.csv | 20 ++++ src/public/uploads/Book21.csv | 20 ++++ src/public/uploads/Book22.csv | 20 ++++ src/storage/api-docs/api-docs.json | 0 src/storage/app/.gitignore | 0 src/storage/app/public/.gitignore | 0 src/storage/app/public/template-resurse.csv | 0 src/storage/app/public/template-voluntari.csv | 0 src/storage/framework/.gitignore | 0 src/storage/framework/cache/.gitignore | 0 src/storage/framework/cache/data/.gitignore | 0 src/storage/framework/sessions/.gitignore | 0 src/storage/framework/testing/.gitignore | 0 src/storage/framework/views/.gitignore | 0 src/storage/logs/.gitignore | 0 23 files changed, 189 insertions(+), 35 deletions(-) mode change 100644 => 100755 src/app/Http/Controllers/OrganisationController.php mode change 100644 => 100755 src/app/Http/Controllers/VolunteerController.php mode change 100644 => 100755 src/app/Rules/Cnp.php create mode 100755 src/app/Rules/VolunteerEmail.php mode change 100755 => 100644 src/artisan mode change 100644 => 100755 src/bootstrap/cache/.gitignore mode change 100755 => 100644 src/database/migrations/v_1_0_0.php create mode 100644 src/public/uploads/Book2.csv create mode 100644 src/public/uploads/Book21.csv create mode 100644 src/public/uploads/Book22.csv mode change 100644 => 100755 src/storage/api-docs/api-docs.json mode change 100644 => 100755 src/storage/app/.gitignore mode change 100644 => 100755 src/storage/app/public/.gitignore mode change 100644 => 100755 src/storage/app/public/template-resurse.csv mode change 100644 => 100755 src/storage/app/public/template-voluntari.csv mode change 100644 => 100755 src/storage/framework/.gitignore mode change 100644 => 100755 src/storage/framework/cache/.gitignore mode change 100644 => 100755 src/storage/framework/cache/data/.gitignore mode change 100644 => 100755 src/storage/framework/sessions/.gitignore mode change 100644 => 100755 src/storage/framework/testing/.gitignore mode change 100644 => 100755 src/storage/framework/views/.gitignore mode change 100644 => 100755 src/storage/logs/.gitignore diff --git a/src/.gitignore b/src/.gitignore index b6a4b86..fae607d 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,6 +1,7 @@ /node_modules /public/hot /public/storage +/public/uploads /storage/*.key /vendor /.idea diff --git a/src/app/Http/Controllers/OrganisationController.php b/src/app/Http/Controllers/OrganisationController.php old mode 100644 new mode 100755 diff --git a/src/app/Http/Controllers/VolunteerController.php b/src/app/Http/Controllers/VolunteerController.php old mode 100644 new mode 100755 index 51227ae..d660a87 --- a/src/app/Http/Controllers/VolunteerController.php +++ b/src/app/Http/Controllers/VolunteerController.php @@ -17,6 +17,7 @@ use App\Organisation; use App\Allocation; use App\Rules\Cnp; +use App\Rules\VolunteerEmail; use Carbon\Carbon; use App\DBViews\StaticCitiesBySlugAndNameView; use App\DBViews\StaticCountiesBySlugAndNameView; @@ -26,12 +27,12 @@ class VolunteerController extends Controller { /** * Function responsible of processing get all volunteers requests. - * + * * @param object $request Contains all the data needed for extracting all the volunteers list. - * + * * @return object 200 and the list of volunteers if successful * 500 if an error occurs - * + * * @SWG\Get( * tags={"Volunteers"}, * path="/api/volunteers", @@ -58,12 +59,12 @@ public function index(Request $request) { /** * Function responsible of processing get volunteer requests. - * + * * @param string $id The ID of the volunteer to be extracted. - * + * * @return object 200 and the volunteer details if successful * 500 if an error occurs - * + * * @SWG\Get( * tags={"Volunteers"}, * path="/api/volunteers/{id}", @@ -82,14 +83,14 @@ public function show($id) { /** * Function responsible of processing put volunteer requests. - * + * * @param object $request Contains all the data needed for saving a new volunteer. - * + * * @return object 201 and the volunteer details if successful * 400 if validation fails * 404 if organization not found fails * 500 if an error occurs - * + * * @SWG\Post( * tags={"Volunteers"}, * path="/api/volunteers", @@ -204,7 +205,8 @@ public function store(Request $request) { $data = $request->all(); $rules = [ 'organisation_id' => 'required', - 'email' => 'required|string|email|max:255|unique:volunteers.volunteers', +// 'email' => 'required|string|email|max:255|unique:volunteers.volunteers', + 'email' => ['required','string','email','max:255', new VolunteerEmail($request->get('ssn', ''))], 'phone' => 'required|string|min:6|', 'ssn' => new Cnp, 'name' => 'required|string|max:255', @@ -215,7 +217,7 @@ public function store(Request $request) { return response(['errors' => $validator->errors()->all()], 400); } - /** Validate SSN uniqueness. */ + /** Validate SSN format and uniqueness. */ $data = convertData($validator->validated(), $rules); if (isset($validator->validated()['ssn']) && $validator->validated()['ssn']) { $data['ssn'] = $validator->validated()['ssn']; @@ -231,7 +233,7 @@ public function store(Request $request) { $organisation_id = $request->organisation_id; $organisation = \DB::connection('organisations')->collection('organisations')->where('_id', '=', $organisation_id)->get(['_id', 'name', 'website'])->first(); if (!$organisation) { - return response()->json('Organizatia nu exista', 404); + return response()->json('Organizatia nu exista', 404); } $data['organisation'] = $organisation; @@ -240,15 +242,23 @@ public function store(Request $request) { if ($request->has('county')) { $data['county'] = getCityOrCounty($request->county,County::query()); } - if ($request->has('city')) { + if ($request->has('city')) { $data['city'] = getCityOrCounty($request->city,City::query()); } /** Add 'adden by' to the the volunteer */ $data['added_by'] = \Auth::check() ? \Auth::user()->_id : ''; $data['courses'] = []; - /** Create the volunteer. */ - $volunteer = Volunteer::create($data); + + /** if SSN already exists in database then update the organisation_id and course */ + $volunteer = Volunteer::query()->where('ssn', '=', $data['ssn'])->first(); + if($volunteer){ + $volunteer->organisation = $data['organisation']; + $data['courses'] = $volunteer->courses; + }else{ + /** Create the volunteer. */ + $volunteer = Volunteer::create($data); + } /** Extract all courses from request and process them. */ $courses = $request->has('courses') ? $request->courses : ''; @@ -284,6 +294,37 @@ public function store(Request $request) { } /** Add the 'courses' to the volunteer. */ $volunteer->courses = $data['courses']; + }else{ + /** if is specified only a course */ + $course_name_id = $request->has('course_name_id') ? $request->course_name_id : ''; + if (trim($course_name_id)!='') { + $course_name = CourseName::find($course_name_id); + if ($course_name) { + /** Create a new course. */ + $newCourse = [ + 'course_name' => [ + '_id' => $course_name['_id'], + 'name' => $course_name['name'], + 'slug' => removeDiacritics($course_name['name'])], + 'obtained' => Carbon::parse($request->get('obtained',''))->format('Y-m-d H:i:s') + ]; + /** Check if the accreditor already exists in DB. */ + $courseAccreditor = CourseAccreditor::query()->where('name', '=', $request->get('accredited_by',''))->first(); + if (!$courseAccreditor) { + $courseAccreditor = CourseAccreditor::create(['name' => $request->get('accredited_by',''), 'courses' => [$course_name['_id']]]); + } else { + if (is_array($courseAccreditor->courses) && !in_array($course_name['_id'], $courseAccreditor->courses)) { + $courseAccreditor->courses = array_merge( $courseAccreditor->courses, [$course_name['_id']]); + $courseAccreditor->save(); + } + } + /** Save the accreditor and add the course to the volunteer. */ + $newCourse['accredited'] = ['_id' => $courseAccreditor->_id,'name' => $courseAccreditor->name]; + $data['courses'][] = $newCourse; + $volunteer->courses = $data['courses']; + } + } + } $volunteer->save(); @@ -292,27 +333,27 @@ public function store(Request $request) { notifyUpdate('dsu', new VolunteerAdd(['name' => $volunteer->organisation['name']])); } - return response()->json($volunteer, 201); + return response()->json($volunteer, 201); } /** * Function responsible of processing a volunteer update requests. - * + * * @param object $request Contains all the data needed for updating a volunteer. * @param string $id The ID of the volunteer to be updated. - * + * * @return object 201 and the JSON encoded volunteer details if successful * 404 if email or CNP/SSN are invalid fails * 500 if an error occurs - * + * * @SWG\put( * tags={"Volunteers"}, * path="/api/volunteers/{id}", * summary="Update volunteer", * operationId="update", * @SWG\Response(response=200, description="successful operation"), - * @SWG\Response(response=404, description="not valid"), + * @SWG\Response(response=404, description="not valid"), * @SWG\Response(response=406, description="not acceptable"), * @SWG\Response(response=500, description="internal server error") * ) @@ -340,7 +381,7 @@ public function update(Request $request, $id) { if ($data['county'] && !is_null($data['county'])) { $data['county'] = getCityOrCounty($request['county'],County::query()); } - if ($data['city'] && !is_null($data['city'])) { + if ($data['city'] && !is_null($data['city'])) { $data['city'] = getCityOrCounty($request['city'],City::query()); } /** Extract and set 'organisation_id'. */ @@ -404,12 +445,12 @@ public function update(Request $request, $id) { /** * Function responsible of processing delete volunteers requests. - * + * * @param string $id The ID of the volunteer to be deleted. - * + * * @return object 200 if deletion is successful * 500 if an error occurs - * + * * @SWG\Delete( * tags={"Volunteers"}, * path="/api/volunteers/{id}", @@ -443,12 +484,12 @@ public function delete($id) { /** * Function responsible of processing import volunteers requests. - * + * * @param object $request Contains all the data needed for importing a list of volunteers. - * + * * @return object 200 if import is successful * 500 if an error occurs - * + * * @SWG\Post( * tags={"Volunteers"}, * path="/api/volunteers/import", @@ -472,7 +513,7 @@ public function delete($id) { * @SWG\Response(response=406, description="not acceptable"), * @SWG\Response(response=500, description="internal server error") * ) - * + * */ public function importVolunteers(Request $request) { $file = $request->file('file'); @@ -533,7 +574,7 @@ public function importVolunteers(Request $request) { $num = count($setUpData); if($i == 0){ $i++; - continue; + continue; } $error = verifyErrors($error, $setUpData[0],'Nume'); $error = verifyErrors($error, $setUpData[1],'CNP'); @@ -677,9 +718,9 @@ public function importVolunteers(Request $request) { /** * Function responsible of extracting the list of allocations of a volunteer. - * + * * @param string $id The ID of the volunteer for which to extract the allocations list. - * + * * @return object 200 if extraction is successful * 500 if an error occurs */ @@ -692,7 +733,7 @@ public function allocations($id) { /** * Function responsible of returning the volunteers import template file. - * + * * @return object 200 and the template-voluntari.csv file if successful * 500 if an error occurs */ diff --git a/src/app/Rules/Cnp.php b/src/app/Rules/Cnp.php old mode 100644 new mode 100755 index 1526bbb..23643f6 --- a/src/app/Rules/Cnp.php +++ b/src/app/Rules/Cnp.php @@ -26,9 +26,9 @@ public function __construct() */ public function passes($attribute, $value) { - - $exist = Volunteer::query()->where('ssn', '=', $value)->first(); - if (strlen($value) === 13 && !$exist) { +// $exist = Volunteer::query()->where('ssn', '=', $value)->first(); +// if (strlen($value) === 13 && !$exist) { + if (strlen($value) === 13 ) { $cnp = array_map('intval',str_split($value)); $coefs = [2, 7, 9, 1, 4, 6, 3, 5, 8, 2, 7, 9]; diff --git a/src/app/Rules/VolunteerEmail.php b/src/app/Rules/VolunteerEmail.php new file mode 100755 index 0000000..dcb608f --- /dev/null +++ b/src/app/Rules/VolunteerEmail.php @@ -0,0 +1,52 @@ +cnp = $cnp; + } + + /** + * Determine if the validation rule passes. + * + * @param string $attribute + * @param mixed $value + * @return bool + */ + public function passes($attribute, $value) + { + /** The email address should be unique unless the cnp is the same with an existing volunteer */ + $exist = Volunteer::query()->where('email', '=', $value)->first(); + if($exist){ + if($exist->ssn == $this->cnp){ + return true; + } + return false; + } + return true; + } + + /** + * Get the validation error message. + * + * @return string + */ + public function message() + { + return 'The email has already been taken.'; + } +} diff --git a/src/artisan b/src/artisan old mode 100755 new mode 100644 diff --git a/src/bootstrap/cache/.gitignore b/src/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/src/database/migrations/v_1_0_0.php b/src/database/migrations/v_1_0_0.php old mode 100755 new mode 100644 diff --git a/src/public/uploads/Book2.csv b/src/public/uploads/Book2.csv new file mode 100644 index 0000000..9baa2ef --- /dev/null +++ b/src/public/uploads/Book2.csv @@ -0,0 +1,20 @@ +Edwin Mikels ,1871129104416,edwinmikels@test.com,14546789321,Constanta,Constanta,inginer,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU +Desirae Kmetz ,2890831247315,desiraekmetz@test.com,14546789322,Arad,Arad,profesor,,235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU +Renita Redel ,6001118331107,renitaredel@test.com,14546789323,Timis,Lugoj,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d3720069c7:2015-02-23:ISU +Mack Rodrick ,1880731044579,mackrodrick@test.com,14546789324,Arges,Pitesti,student,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU +Emiko Feuerstein ,1891208385964,emikofeuerstein@test.com,14546789325,Constanta,Constanta,vanzator,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU +Elna Gobble ,1910820267601,elnagobble@test.com,14546789326,Arad,Arad,inginer,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Renata Straub ,5000805115927,renatastraub@test.com,14546789327,Timis,Lugoj,profesor,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU +Sheridan Meinke ,1871129104416,sheridanmeinke@test.com,14546789328,Arges,Pitesti,medic,,235fbc1bab155c5af4c7a7d372002d86:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU +Deloras Hileman ,2890831247315,delorashileman@test.com,14546789329,Constanta,Constanta,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU +Guy Bussey ,6001118331107,guybussey@test.com,14546789330,Arad,Arad,vanzator,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU +Leanna Lembo ,1880731044579,leannalembo@test.com,14546789331,Timis,Lugoj,inginer,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU +Kesha Desimone ,1891208385964,keshadesimone@test.com,14546789332,Arges,Pitesti,profesor,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU +Neil Monday ,1910820267601,neilmonday@test.com,14546789333,Constanta,Constanta,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU +Mariam Rozzell ,5000805115927,mariamrozzell@test.com,14546789334,Arad,Arad,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Catherine Chilson ,1871129104416,catherinechilson@test.com,14546789335,Timis,Lugoj,vanzator,,235fbc1bab155c5af4c7a7d3720069c7:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU +Lavonda Mawson ,2890831247315,lavondamawson@test.com,14546789336,Arges,Pitesti,inginer,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Chadwick Crozier ,6001118331107,chadwickcrozier@test.com,14546789337,Constanta,Constanta,profesor,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Mitchell Dearborn ,1880731044579,mitchelldearborn@test.com,14546789338,Arad,Arad,medic,,235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU +John Gullette ,1891208385964,johngullette@test.com,14546789339,Timis,Lugoj,student,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU +Kia Jasmin ,1910820267601,kiajasmin@test.com,14546789340,Arges,Pitesti,vanzator,,235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU diff --git a/src/public/uploads/Book21.csv b/src/public/uploads/Book21.csv new file mode 100644 index 0000000..72fc742 --- /dev/null +++ b/src/public/uploads/Book21.csv @@ -0,0 +1,20 @@ +Edwin Mikels ,1871129104416,edwinmikels@test.com,14546789321,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU +Desirae Kmetz ,2890831247315,desiraekmetz@test.com,14546789322,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU +Renita Redel ,6001118331107,renitaredel@test.com,14546789323,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d3720069c7:2015-02-23:ISU +Mack Rodrick ,1880731044579,mackrodrick@test.com,14546789324,alba,abrud,student,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU +Emiko Feuerstein ,1891208385964,emikofeuerstein@test.com,14546789325,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU +Elna Gobble ,1910820267601,elnagobble@test.com,14546789326,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Renata Straub ,5000805115927,renatastraub@test.com,14546789327,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU +Sheridan Meinke ,1871129104416,sheridanmeinke@test.com,14546789328,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372002d86:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU +Deloras Hileman ,2890831247315,delorashileman@test.com,14546789329,alba,abrud,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU +Guy Bussey ,6001118331107,guybussey@test.com,14546789330,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU +Leanna Lembo ,1880731044579,leannalembo@test.com,14546789331,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU +Kesha Desimone ,1891208385964,keshadesimone@test.com,14546789332,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU +Neil Monday ,1910820267601,neilmonday@test.com,14546789333,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU +Mariam Rozzell ,5000805115927,mariamrozzell@test.com,14546789334,alba,abrud,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Catherine Chilson ,1871129104416,catherinechilson@test.com,14546789335,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d3720069c7:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU +Lavonda Mawson ,2890831247315,lavondamawson@test.com,14546789336,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Chadwick Crozier ,6001118331107,chadwickcrozier@test.com,14546789337,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU +Mitchell Dearborn ,1880731044579,mitchelldearborn@test.com,14546789338,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU +John Gullette ,1891208385964,johngullette@test.com,14546789339,alba,abrud,student,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU +Kia Jasmin ,1910820267601,kiajasmin@test.com,14546789340,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU diff --git a/src/public/uploads/Book22.csv b/src/public/uploads/Book22.csv new file mode 100644 index 0000000..7133bbf --- /dev/null +++ b/src/public/uploads/Book22.csv @@ -0,0 +1,20 @@ +Edwin Mikels ,1871129104416,edwinmikels@test.com,14546789321,Alba,Preluca,inginer,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU +Desirae Kmetz ,2890831247315,desiraekmetz@test.com,14546789322,Alba,Arti,profesor,,Prim-ajutor calificat:219-11-22:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):219-11-22:ISU +Renita Redel ,6001118331107,renitaredel@test.com,14546789323,Alba,Bai,medic,,Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2015-02-23:ISU +Mack Rodrick ,1880731044579,mackrodrick@test.com,14546789324,Alba,Campeni,student,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU +Emiko Feuerstein ,1891208385964,emikofeuerstein@test.com,14546789325,Alba,Butesti,vanzator,,Prim-ajutor calificat:219-11-22:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):2018-07-15:ISU +Elna Gobble ,1910820267601,elnagobble@test.com,14546789326,Alba,Calnic,inginer,,Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU;Prim-ajutor calificat:219-11-22:ISU +Renata Straub ,5000805115927,renatastraub@test.com,14546789327,Alba,Preluca,profesor,,Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU;Prim-ajutor de baza:219-11-22:ISU +Sheridan Meinke ,1871129104416,sheridanmeinke@test.com,14546789328,Alba,Arti,medic,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU +Deloras Hileman ,2890831247315,delorashileman@test.com,14546789329,Alba,Bai,student,,Prim-ajutor calificat:2018-07-15:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2015-02-23:ISU +Guy Bussey ,6001118331107,guybussey@test.com,14546789330,Alba,Campeni,vanzator,,Sofer profesionist (permis pentru ambulanta sau alte masini mari):2015-02-23:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):219-11-22:ISU +Leanna Lembo ,1880731044579,leannalembo@test.com,14546789331,Alba,Butesti,inginer,,Prim-ajutor de baza:2015-02-23:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):219-11-22:ISU +Kesha Desimone ,1891208385964,keshadesimone@test.com,14546789332,Alba,Calnic,profesor,,Prim-ajutor de baza:219-11-22:ISU;Prim-ajutor calificat:2018-07-15:ISU +Neil Monday ,1910820267601,neilmonday@test.com,14546789333,Alba,Preluca,medic,,Prim-ajutor de baza:219-11-22:ISU;Prim-ajutor de baza:2018-07-15:ISU +Mariam Rozzell ,5000805115927,mariamrozzell@test.com,14546789334,Alba,Arti,student,,Prim-ajutor calificat:2015-02-23:ISU;Prim-ajutor calificat:2018-07-15:ISU +Catherine Chilson ,1871129104416,catherinechilson@test.com,14546789335,Alba,Bai,vanzator,,Medicina primara (asistente/medici rezidenti/etc):2015-02-23:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):2018-07-15:ISU +Lavonda Mawson ,2890831247315,lavondamawson@test.com,14546789336,Alba,Campeni,inginer,,Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU;Prim-ajutor calificat:2015-02-23:ISU +Chadwick Crozier ,6001118331107,chadwickcrozier@test.com,14546789337,Alba,Butesti,profesor,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):2015-02-23:ISU +Mitchell Dearborn ,1880731044579,mitchelldearborn@test.com,14546789338,Alba,Calnic,medic,,Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU;Prim-ajutor de baza:219-11-22:ISU +John Gullette ,1891208385964,johngullette@test.com,14546789339,Alba,Preluca,student,,Prim-ajutor calificat:219-11-22:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):219-11-22:ISU +Kia Jasmin ,1910820267601,kiajasmin@test.com,14546789340,Alba,Arti,vanzator,,Sofer profesionist (permis pentru ambulanta sau alte masini mari):2015-02-23:ISU;Prim-ajutor de baza:2018-07-15:ISU diff --git a/src/storage/api-docs/api-docs.json b/src/storage/api-docs/api-docs.json old mode 100644 new mode 100755 diff --git a/src/storage/app/.gitignore b/src/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/app/public/.gitignore b/src/storage/app/public/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/app/public/template-resurse.csv b/src/storage/app/public/template-resurse.csv old mode 100644 new mode 100755 diff --git a/src/storage/app/public/template-voluntari.csv b/src/storage/app/public/template-voluntari.csv old mode 100644 new mode 100755 diff --git a/src/storage/framework/.gitignore b/src/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/framework/cache/.gitignore b/src/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/framework/cache/data/.gitignore b/src/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/framework/sessions/.gitignore b/src/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/framework/testing/.gitignore b/src/storage/framework/testing/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/framework/views/.gitignore b/src/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/src/storage/logs/.gitignore b/src/storage/logs/.gitignore old mode 100644 new mode 100755 From f628b44f8d9c657935df30a068071d28623c698b Mon Sep 17 00:00:00 2001 From: Dan Date: Sun, 1 Mar 2020 06:21:31 +0000 Subject: [PATCH 2/2] #114 _1 --- src/public/uploads/Book2.csv | 20 -------------------- src/public/uploads/Book21.csv | 20 -------------------- src/public/uploads/Book22.csv | 20 -------------------- 3 files changed, 60 deletions(-) delete mode 100644 src/public/uploads/Book2.csv delete mode 100644 src/public/uploads/Book21.csv delete mode 100644 src/public/uploads/Book22.csv diff --git a/src/public/uploads/Book2.csv b/src/public/uploads/Book2.csv deleted file mode 100644 index 9baa2ef..0000000 --- a/src/public/uploads/Book2.csv +++ /dev/null @@ -1,20 +0,0 @@ -Edwin Mikels ,1871129104416,edwinmikels@test.com,14546789321,Constanta,Constanta,inginer,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU -Desirae Kmetz ,2890831247315,desiraekmetz@test.com,14546789322,Arad,Arad,profesor,,235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU -Renita Redel ,6001118331107,renitaredel@test.com,14546789323,Timis,Lugoj,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d3720069c7:2015-02-23:ISU -Mack Rodrick ,1880731044579,mackrodrick@test.com,14546789324,Arges,Pitesti,student,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU -Emiko Feuerstein ,1891208385964,emikofeuerstein@test.com,14546789325,Constanta,Constanta,vanzator,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU -Elna Gobble ,1910820267601,elnagobble@test.com,14546789326,Arad,Arad,inginer,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Renata Straub ,5000805115927,renatastraub@test.com,14546789327,Timis,Lugoj,profesor,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU -Sheridan Meinke ,1871129104416,sheridanmeinke@test.com,14546789328,Arges,Pitesti,medic,,235fbc1bab155c5af4c7a7d372002d86:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU -Deloras Hileman ,2890831247315,delorashileman@test.com,14546789329,Constanta,Constanta,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU -Guy Bussey ,6001118331107,guybussey@test.com,14546789330,Arad,Arad,vanzator,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU -Leanna Lembo ,1880731044579,leannalembo@test.com,14546789331,Timis,Lugoj,inginer,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU -Kesha Desimone ,1891208385964,keshadesimone@test.com,14546789332,Arges,Pitesti,profesor,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU -Neil Monday ,1910820267601,neilmonday@test.com,14546789333,Constanta,Constanta,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU -Mariam Rozzell ,5000805115927,mariamrozzell@test.com,14546789334,Arad,Arad,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Catherine Chilson ,1871129104416,catherinechilson@test.com,14546789335,Timis,Lugoj,vanzator,,235fbc1bab155c5af4c7a7d3720069c7:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU -Lavonda Mawson ,2890831247315,lavondamawson@test.com,14546789336,Arges,Pitesti,inginer,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Chadwick Crozier ,6001118331107,chadwickcrozier@test.com,14546789337,Constanta,Constanta,profesor,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Mitchell Dearborn ,1880731044579,mitchelldearborn@test.com,14546789338,Arad,Arad,medic,,235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU -John Gullette ,1891208385964,johngullette@test.com,14546789339,Timis,Lugoj,student,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU -Kia Jasmin ,1910820267601,kiajasmin@test.com,14546789340,Arges,Pitesti,vanzator,,235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU diff --git a/src/public/uploads/Book21.csv b/src/public/uploads/Book21.csv deleted file mode 100644 index 72fc742..0000000 --- a/src/public/uploads/Book21.csv +++ /dev/null @@ -1,20 +0,0 @@ -Edwin Mikels ,1871129104416,edwinmikels@test.com,14546789321,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU -Desirae Kmetz ,2890831247315,desiraekmetz@test.com,14546789322,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU -Renita Redel ,6001118331107,renitaredel@test.com,14546789323,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d3720069c7:2015-02-23:ISU -Mack Rodrick ,1880731044579,mackrodrick@test.com,14546789324,alba,abrud,student,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU -Emiko Feuerstein ,1891208385964,emikofeuerstein@test.com,14546789325,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU -Elna Gobble ,1910820267601,elnagobble@test.com,14546789326,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Renata Straub ,5000805115927,renatastraub@test.com,14546789327,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU -Sheridan Meinke ,1871129104416,sheridanmeinke@test.com,14546789328,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372002d86:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU -Deloras Hileman ,2890831247315,delorashileman@test.com,14546789329,alba,abrud,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU -Guy Bussey ,6001118331107,guybussey@test.com,14546789330,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372002d86:2018-07-15:ISU -Leanna Lembo ,1880731044579,leannalembo@test.com,14546789331,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU -Kesha Desimone ,1891208385964,keshadesimone@test.com,14546789332,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372002d86:219-11-22:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU -Neil Monday ,1910820267601,neilmonday@test.com,14546789333,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372003021:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:219-11-22:ISU -Mariam Rozzell ,5000805115927,mariamrozzell@test.com,14546789334,alba,abrud,student,,235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Catherine Chilson ,1871129104416,catherinechilson@test.com,14546789335,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d3720069c7:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:2018-07-15:ISU -Lavonda Mawson ,2890831247315,lavondamawson@test.com,14546789336,alba,abrud,inginer,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Chadwick Crozier ,6001118331107,chadwickcrozier@test.com,14546789337,alba,abrud,profesor,,235fbc1bab155c5af4c7a7d372004f24:2015-02-23:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU -Mitchell Dearborn ,1880731044579,mitchelldearborn@test.com,14546789338,alba,abrud,medic,,235fbc1bab155c5af4c7a7d372001138:219-11-22:ISU;235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU -John Gullette ,1891208385964,johngullette@test.com,14546789339,alba,abrud,student,,235fbc1bab155c5af4c7a7d3720069c7:2018-07-15:ISU;235fbc1bab155c5af4c7a7d372001138:2015-02-23:ISU -Kia Jasmin ,1910820267601,kiajasmin@test.com,14546789340,alba,abrud,vanzator,,235fbc1bab155c5af4c7a7d372003021:219-11-22:ISU;235fbc1bab155c5af4c7a7d372004f24:2018-07-15:ISU diff --git a/src/public/uploads/Book22.csv b/src/public/uploads/Book22.csv deleted file mode 100644 index 7133bbf..0000000 --- a/src/public/uploads/Book22.csv +++ /dev/null @@ -1,20 +0,0 @@ -Edwin Mikels ,1871129104416,edwinmikels@test.com,14546789321,Alba,Preluca,inginer,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU -Desirae Kmetz ,2890831247315,desiraekmetz@test.com,14546789322,Alba,Arti,profesor,,Prim-ajutor calificat:219-11-22:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):219-11-22:ISU -Renita Redel ,6001118331107,renitaredel@test.com,14546789323,Alba,Bai,medic,,Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2015-02-23:ISU -Mack Rodrick ,1880731044579,mackrodrick@test.com,14546789324,Alba,Campeni,student,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU -Emiko Feuerstein ,1891208385964,emikofeuerstein@test.com,14546789325,Alba,Butesti,vanzator,,Prim-ajutor calificat:219-11-22:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):2018-07-15:ISU -Elna Gobble ,1910820267601,elnagobble@test.com,14546789326,Alba,Calnic,inginer,,Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU;Prim-ajutor calificat:219-11-22:ISU -Renata Straub ,5000805115927,renatastraub@test.com,14546789327,Alba,Preluca,profesor,,Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU;Prim-ajutor de baza:219-11-22:ISU -Sheridan Meinke ,1871129104416,sheridanmeinke@test.com,14546789328,Alba,Arti,medic,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Medicina primara (asistente/medici rezidenti/etc):2018-07-15:ISU -Deloras Hileman ,2890831247315,delorashileman@test.com,14546789329,Alba,Bai,student,,Prim-ajutor calificat:2018-07-15:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2015-02-23:ISU -Guy Bussey ,6001118331107,guybussey@test.com,14546789330,Alba,Campeni,vanzator,,Sofer profesionist (permis pentru ambulanta sau alte masini mari):2015-02-23:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):219-11-22:ISU -Leanna Lembo ,1880731044579,leannalembo@test.com,14546789331,Alba,Butesti,inginer,,Prim-ajutor de baza:2015-02-23:ISU;Personal medical auxiliar (brancardieri/mediatori sanitari/etc):219-11-22:ISU -Kesha Desimone ,1891208385964,keshadesimone@test.com,14546789332,Alba,Calnic,profesor,,Prim-ajutor de baza:219-11-22:ISU;Prim-ajutor calificat:2018-07-15:ISU -Neil Monday ,1910820267601,neilmonday@test.com,14546789333,Alba,Preluca,medic,,Prim-ajutor de baza:219-11-22:ISU;Prim-ajutor de baza:2018-07-15:ISU -Mariam Rozzell ,5000805115927,mariamrozzell@test.com,14546789334,Alba,Arti,student,,Prim-ajutor calificat:2015-02-23:ISU;Prim-ajutor calificat:2018-07-15:ISU -Catherine Chilson ,1871129104416,catherinechilson@test.com,14546789335,Alba,Bai,vanzator,,Medicina primara (asistente/medici rezidenti/etc):2015-02-23:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):2018-07-15:ISU -Lavonda Mawson ,2890831247315,lavondamawson@test.com,14546789336,Alba,Campeni,inginer,,Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU;Prim-ajutor calificat:2015-02-23:ISU -Chadwick Crozier ,6001118331107,chadwickcrozier@test.com,14546789337,Alba,Butesti,profesor,,Personal medical auxiliar (brancardieri/mediatori sanitari/etc):2018-07-15:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):2015-02-23:ISU -Mitchell Dearborn ,1880731044579,mitchelldearborn@test.com,14546789338,Alba,Calnic,medic,,Medicina primara (asistente/medici rezidenti/etc):219-11-22:ISU;Prim-ajutor de baza:219-11-22:ISU -John Gullette ,1891208385964,johngullette@test.com,14546789339,Alba,Preluca,student,,Prim-ajutor calificat:219-11-22:ISU;Sofer profesionist (permis pentru ambulanta sau alte masini mari):219-11-22:ISU -Kia Jasmin ,1910820267601,kiajasmin@test.com,14546789340,Alba,Arti,vanzator,,Sofer profesionist (permis pentru ambulanta sau alte masini mari):2015-02-23:ISU;Prim-ajutor de baza:2018-07-15:ISU