Skip to content

Commit 607da06

Browse files
stevanpostevanpo
authored
Merge pull request #3027 from codeeu/dev
Dev
2 parents 457e071 + 46d700f commit 607da06

File tree

92 files changed

+298
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+298
-183
lines changed

‎app/Http/Controllers/EventController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public function store(EventRequest $request): JsonResponse
9898

9999
$user->save();
100100

101+
/** @var Event $event */
101102
$event = EventsQuery::store($request);
102103

103104
$event->notifyAmbassadors();

‎app/Imports/AppleEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function model(array $row): ?Model
3131
'created' => now(),
3232
'updated' => now(),
3333
'codeweek_for_all_participation_code' => 'cw23-apple-eu',
34+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
3435
'start_date' => $this->parseDate($row['start_date']),
3536
'end_date' => $this->parseDate($row['end_date']),
3637
'geoposition' => $row['latitude'].','.$row['longitude'],

‎app/Imports/AvandeEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public function model(array $row): ?Model
6363
'created' => now(),
6464
'updated' => now(),
6565
'codeweek_for_all_participation_code' => 'cw25-avande-eu',
66+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
6667
'start_date' => $this->parseDate($row['start_date']),
6768
'end_date' => $this->parseDate($row['end_date']),
6869
'geoposition' => (!empty($row['latitude']) && !empty($row['longitude'])) ? $row['latitude'] . ',' . $row['longitude'] : '',

‎app/Imports/BulgariaEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public function model(array $row): ?Model
4141
'created' => now(),
4242
'updated' => now(),
4343
'codeweek_for_all_participation_code' => 'cw19-bulgaria',
44+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
4445
'start_date' => $this->parseDate($row['start_date']),
4546
'end_date' => $this->parseDate($row['end_date']),
4647
'geoposition' => $row['latitude'].','.$row['longitude'],

‎app/Imports/CoderDojoEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public function model(array $row): ?Model
5555
'created' => now(),
5656
'updated' => now(),
5757
'codeweek_for_all_participation_code' => 'cw20-coderdojo-eu',
58+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
5859
'start_date' => \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row['start_date']),
5960
'end_date' => \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row['end_date']),
6061
'geoposition' => (!empty($row['latitude']) && !empty($row['longitude'])) ? $row['latitude'] . ',' . $row['longitude'] : '',

‎app/Imports/CodingActivitiesEUCodeWeekSiteImport.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ public function model(array $row): ?Model
5959
'pub_date' => now(),
6060
'created' => now(),
6161
'updated' => now(),
62-
'codeweek_for_all_participation_code' => '',
62+
'codeweek_for_all_participation_code' => $row['codeweek_for_all_participation_code'] ?? '',
63+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
6364
'start_date' => $this->parseDate($row['start_date']),
6465
'end_date' => $this->parseDate($row['end_date']),
6566
'geoposition' => $row['latitude'].','.$row['longitude'],

‎app/Imports/DutchDanceEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public function model(array $row): ?Model
5656
'created' => now(),
5757
'updated' => now(),
5858
'codeweek_for_all_participation_code' => 'cw21-CodeWeekNL',
59+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
5960
'start_date' => $this->parseDate($row['start_date']),
6061
'end_date' => $this->parseDate($row['end_date']),
6162
'geoposition' => $row['longitude'].','.$row['latitude'],

‎app/Imports/DutchMoorlagEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public function model(array $row): ?Model
4040
'created' => now(),
4141
'updated' => now(),
4242
'codeweek_for_all_participation_code' => 'NL-Moorlag-001',
43+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
4344
'start_date' => $this->parseDate($row['start_date']),
4445
'end_date' => $this->parseDate($row['end_date']),
4546
'geoposition' => $row['longitude'].','.$row['latitude'],

‎app/Imports/DutchSimoneEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public function model(array $row): ?Model
4040
'created' => now(),
4141
'updated' => now(),
4242
'codeweek_for_all_participation_code' => 'cw23-CodeWeekNL',
43+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
4344
'start_date' => $this->parseDate($row['start_date']),
4445
'end_date' => $this->parseDate($row['end_date']),
4546
'geoposition' => $row['latitude'].','.$row['longitude'],

‎app/Imports/EventiEventsImport.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public function model(array $row): ?Model
5555
'created' => now(),
5656
'updated' => now(),
5757
'codeweek_for_all_participation_code' => 'cw20-coderdojo-eu',
58+
'leading_teacher_tag' => $row['leading_teacher_tag'] ?? null,
5859
'start_date' => \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row['start_date']),
5960
'end_date' => \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row['end_date']),
6061
'geoposition' => (!empty($row['latitude']) && !empty($row['longitude'])) ? $row['latitude'] . ',' . $row['longitude'] : '',

0 commit comments

Comments
 (0)