@elseif ($clubEvent->section->id == 1)
-
+
@elseif ($clubEvent->section->id == 2)
-
+
@else
{{-- DEFAULT --}}
@@ -29,9 +29,9 @@
@elseif ($clubEvent->evnt_type == 7 OR $clubEvent->evnt_type == 8)
@elseif ($clubEvent->section->id == 1)
-
+
@elseif ($clubEvent->section->id == 2)
-
+
Date: Sun, 27 Aug 2017 23:23:30 +0200
Subject: [PATCH 08/92] fix colors also for public events
---
resources/views/partials/weekCellProtected.blade.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/resources/views/partials/weekCellProtected.blade.php b/resources/views/partials/weekCellProtected.blade.php
index 85f67d89b..0f39b8133 100644
--- a/resources/views/partials/weekCellProtected.blade.php
+++ b/resources/views/partials/weekCellProtected.blade.php
@@ -13,9 +13,9 @@
@elseif ($clubEvent->evnt_type == 7 OR $clubEvent->evnt_type == 8)
@else
{{-- DEFAULT --}}
-
-
+
+
+
From 6cd047cb2b22f6c4db67027c7ba3cb12d351d243 Mon Sep 17 00:00:00 2001
From: Fabian Markert
From e030dc7dc5f0566a2656038a24e0f169cd87dcb0 Mon Sep 17 00:00:00 2001
From: Fabian Markert
Date: Sun, 27 Aug 2017 23:03:59 +0200
Subject: [PATCH 06/92] correct z-index for back-to-top
---
resources/assets/css/vedst.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/resources/assets/css/vedst.css b/resources/assets/css/vedst.css
index cff50eb33..be5f446e0 100644
--- a/resources/assets/css/vedst.css
+++ b/resources/assets/css/vedst.css
@@ -488,6 +488,7 @@ input[type=number],
bottom: 20px;
right: 20px;
display:none;
+ z-index: 1;
}
/* my event */
From 0323dde255447a8084fe9ba542133e03a589c2e9 Mon Sep 17 00:00:00 2001
From: 4D44H <4d44h@protonmail.com>
Date: Sun, 27 Aug 2017 23:23:48 +0200
Subject: [PATCH 07/92] Add whitespace below stats year/month selector
---
resources/views/statisticsView.blade.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/resources/views/statisticsView.blade.php b/resources/views/statisticsView.blade.php
index bacceb07e..908e4ac2d 100644
--- a/resources/views/statisticsView.blade.php
+++ b/resources/views/statisticsView.blade.php
@@ -63,9 +63,9 @@
@endif
- -
-
+
+
+
@elseif ($clubEvent->section->id == 1)
-
+
@elseif ($clubEvent->section->id == 2)
-
+
@else
{{-- DEFAULT --}}
@@ -28,9 +28,9 @@
@elseif ($clubEvent->evnt_type == 7 OR $clubEvent->evnt_type == 8)
@elseif ($clubEvent->section->id == 1)
-
+
@elseif ($clubEvent->section->id == 2)
-
+
@else
{{-- DEFAULT --}}
From 99cfd80a680556d8af698773d26e4045044d5202 Mon Sep 17 00:00:00 2001
From: Fabian Markert
Date: Thu, 25 Jan 2018 22:05:52 +0100
Subject: [PATCH 09/92] Update UpdateLara.php
avoid errors when updating lara
---
app/Console/Commands/UpdateLara.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/Console/Commands/UpdateLara.php b/app/Console/Commands/UpdateLara.php
index 396f4f323..f94f00aba 100755
--- a/app/Console/Commands/UpdateLara.php
+++ b/app/Console/Commands/UpdateLara.php
@@ -52,6 +52,7 @@ public function handle()
'git reset --hard', // reset repo to avoid conflicts
'git pull --rebase', // Download latest changes from GitHub
'rm package-lock.json || true', // remove package-lock, makes sure that you will get the stuff from package.json
+ 'rm composer.lock || true', // remove composer.lock, makes sure that you will get the stuff from composer.json
'sh git-create-revisioninfo-hook.sh', // Update version info in the footer
'composer install', // Install and update dependencies
'php artisan view:clear', // Clear and update cache
From 65bfa89f88389cefc03a714fd8c3f2b55286e369 Mon Sep 17 00:00:00 2001
From: fabian
Date: Thu, 25 Jan 2018 22:47:29 +0100
Subject: [PATCH 10/92] avoid errors when updating lara
(cherry picked from commit 0493ceb)
---
app/Console/Commands/UpdateLara.php | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/app/Console/Commands/UpdateLara.php b/app/Console/Commands/UpdateLara.php
index f65168168..71b3ce4e4 100755
--- a/app/Console/Commands/UpdateLara.php
+++ b/app/Console/Commands/UpdateLara.php
@@ -13,14 +13,14 @@ class UpdateLara extends Command
* @var string
*/
protected $signature = 'lara:update {--server-mode}';
-
+
/**
* The console command description.
*
* @var string
*/
protected $description = 'Enter maintenance mode, pull latests changes from assigned branch, clear cache and views, apply migrations, go live again.';
-
+
/**
* Create a new command instance.
*
@@ -30,7 +30,7 @@ public function __construct()
{
parent::__construct();
}
-
+
/**
* Execute the console command.
*
@@ -42,7 +42,7 @@ public function handle()
$this->info(''); // new line
Log::info('Starting Lara update...');
$this->info('Starting Lara update...');
-
+
$serverMode = $this->option('server-mode');
if ($serverMode) {
$avoidSourseConflictCommand = 'git reset --hard';
@@ -54,10 +54,10 @@ public function handle()
} else {
$reApplyChangesCommand = '# nothing to do';
}
-
+
// start counting time before processing every person
$counterStart = microtime(true);
-
+
// List of instructions to execute
$instructions = [
'php artisan down',
@@ -66,6 +66,8 @@ public function handle()
// reset repo to avoid conflicts
'git pull --rebase',
// Download latest changes from GitHub
+ 'rm composer.lock || true',
+ // remove composer.lock, makes sure that you will get the stuff from composer.json
'rm package-lock.json || true',
// remove package-lock, makes sure that you will get the stuff from package.json
'sh git-create-revisioninfo-hook.sh',
@@ -84,17 +86,17 @@ public function handle()
'php artisan up'
// Exit maintenance mode
];
-
+
// initialize progress bar
$bar = $this->output->createProgressBar(count($instructions));
-
+
// perform the update
foreach ($instructions as $step) {
-
+
// log what you are doing
$this->info(''); // new line
$this->info('Executing "'.$step.'"...');
-
+
// perform the instruction
passthru($step, $result);
$this->info('result: '.$result);
@@ -105,16 +107,16 @@ public function handle()
$bar->advance();
$this->info(''); // new line
}
-
+
// finish progress bar and end counter
$bar->finish();
$counterEnd = microtime(true);
-
+
// Inform the users
$this->info(''); // new line
$this->info(''); // new line
Log::info('Finished Lara update after '.($counterEnd - $counterStart).' seconds.');
$this->info('Finished Lara update after '.($counterEnd - $counterStart).' seconds.');
-
+
}
}
From 38bed8aebda6bf2d2a1d14dc6fd6e0e6fefecb5c Mon Sep 17 00:00:00 2001
From: fabian
Date: Sat, 27 Jan 2018 16:31:04 +0100
Subject: [PATCH 11/92] in case bd club issn't already createt, create it
---
...017_12_02_230639_default_colors_for_sections.php | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/database/migrations/2017_12_02_230639_default_colors_for_sections.php b/database/migrations/2017_12_02_230639_default_colors_for_sections.php
index f1542cdb6..c5288f3f7 100644
--- a/database/migrations/2017_12_02_230639_default_colors_for_sections.php
+++ b/database/migrations/2017_12_02_230639_default_colors_for_sections.php
@@ -12,6 +12,17 @@ class DefaultColorsForSections extends Migration
*/
public function up()
{
+ $section = Section::where('title', '=', 'bd-Club')->first();
+ if (is_null($section)) {
+ $section = new Section();
+ $section->title = self::BD_SECTION_NAME;
+ $section->section_uid = hash("sha512", uniqid());
+ $section->save();
+ $club = new Club();
+ $club->clb_title = $section->title;
+ $club->save();
+ }
+
/** @var sections \Illuminate\Database\Eloquent\Collection[Section] */
$sections = Section::all();
foreach ($sections as $section) {
@@ -27,7 +38,7 @@ public function up()
$section->update();
}
}
-
+
/**
* Reverse the migrations.
*
From 494ce24edbd4130bb3e259607dd0aa98ccc9ce5a Mon Sep 17 00:00:00 2001
From: fabian
Date: Sun, 28 Jan 2018 16:10:43 +0100
Subject: [PATCH 12/92] remove syntax error
---
.../2017_12_02_230639_default_colors_for_sections.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/database/migrations/2017_12_02_230639_default_colors_for_sections.php b/database/migrations/2017_12_02_230639_default_colors_for_sections.php
index c5288f3f7..b4393a9c2 100644
--- a/database/migrations/2017_12_02_230639_default_colors_for_sections.php
+++ b/database/migrations/2017_12_02_230639_default_colors_for_sections.php
@@ -15,7 +15,7 @@ public function up()
$section = Section::where('title', '=', 'bd-Club')->first();
if (is_null($section)) {
$section = new Section();
- $section->title = self::BD_SECTION_NAME;
+ $section->title = 'bd-Club';
$section->section_uid = hash("sha512", uniqid());
$section->save();
$club = new Club();
From d05170b5da769736670fd984c041d23c62b13fa6 Mon Sep 17 00:00:00 2001
From: fabian
Date: Sun, 28 Jan 2018 16:13:01 +0100
Subject: [PATCH 13/92] fix import
---
.../migrations/2017_12_02_230639_default_colors_for_sections.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/database/migrations/2017_12_02_230639_default_colors_for_sections.php b/database/migrations/2017_12_02_230639_default_colors_for_sections.php
index b4393a9c2..ddc39de2e 100644
--- a/database/migrations/2017_12_02_230639_default_colors_for_sections.php
+++ b/database/migrations/2017_12_02_230639_default_colors_for_sections.php
@@ -1,6 +1,7 @@
Date: Mon, 29 Jan 2018 21:59:23 +0100
Subject: [PATCH 14/92] search case sensitive for clubs
---
app/Club.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/Club.php b/app/Club.php
index de7948597..e1f8a0897 100644
--- a/app/Club.php
+++ b/app/Club.php
@@ -43,7 +43,11 @@ public function accountableForStatistics()
public static function activeClubs()
{
- return Club::whereIn('clb_title', Section::all()->pluck('title'));
+ $sectionTitles = Section::all()->pluck('title')->toArray();
+ $clubs = Club::whereIn('clb_title', $sectionTitles)->get()->filter(function (Club $club) use ($sectionTitles) {
+ return in_array($club->clb_title, $sectionTitles);
+ });
+ return Club::whereIn('id',$clubs->map(function (Club $club){ return $club->id; })->toArray());
}
}
From 8bc7aceb752214b893b1a62d31cf272f410d8555 Mon Sep 17 00:00:00 2001
From: fabian
Date: Mon, 29 Jan 2018 22:08:30 +0100
Subject: [PATCH 15/92] make translation more clear
---
resources/lang/de/mainLang.php | 174 ++++++++++++++++-----------------
resources/lang/en/mainLang.php | 4 +-
2 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/resources/lang/de/mainLang.php b/resources/lang/de/mainLang.php
index d5a1a2a7f..f179c9eed 100755
--- a/resources/lang/de/mainLang.php
+++ b/resources/lang/de/mainLang.php
@@ -30,7 +30,7 @@
'notWorkingMail' => 'Etwas funktioniert nicht? Schreibe :Name eine Mail.',
'moreInfosProjectsite' => 'Mehr Infos? Besuche die Projektseite auf GitHub.',
'backToTop' => 'Zurück zum Seitenanfang',
-
+
//-----------------------------------------------------------------------------------------------------
// resources/views
@@ -49,40 +49,40 @@
'marketingFlyersPlacard'=> 'Marketing / Flyer / Plakate', //used in legend.blade.php
'preSale' => 'Vorverkauf',
'others' => 'Sonstiges',
- 'faceDone' => 'Facebook Event erstellt',
+ 'faceDone' => 'Facebook erledigt',
'eventUrl' => 'Event - URL',
'priceTickets' => 'Vorverkaufspreis',
'price' => 'Eintrittspreis',
'studentExtern' => 'Student / Vollzahler',
-
+
//----------------------------------------------
-
+
'begin' => 'Beginn',
'end' => 'Ende',
'eventDefaults' => 'Standardwerte für Events:',
-
+
'DV-Time' => 'DV-Zeit',
'club' => 'Verein',
'internalEventP' => 'Interne Veranstaltung', // Placeholder string
'internEventP' => 'Internes Event', // Placeholder string for example used in monthCell.blade.php
-
+
'willShowFor' => 'wird angezeigt für',
-
+
'changeEvent' => 'Veranstaltung ändern',
'deleteEvent' => 'Veranstaltung löschen',
'confirmDeleteEvent' => 'Diese Veranstaltung wirklich entfernen? Diese Aktion kann nicht rückgängig gemacht werden!',
-
+
'additionalInfo' => 'Weitere Details',
'moreDetails' => 'Interne Information',
-
+
//Button
'showMore' => 'mehr anzeigen',
'showLess' => 'weniger anzeigen',
-
+
'hideTimes' => 'Zeiten ausblenden',
-
+
'addComment' => 'Kommentar hier hinzufügen', //not used Line ClubEventView ~270 Placeholder message and similar
-
+
//List of Changes
'listChanges' => 'Liste der Änderungen',
@@ -94,7 +94,7 @@
'whenWasIt' => 'Wann war das?',
//-------------------------------------------------------------------------------------------------------
-
+
// resources/views/createClubEventView.blade.php
'createNewVEvent' => 'Neue Veranstaltung erstellen',
'createNewEvent' => 'Neues Event erstellen',
@@ -103,7 +103,7 @@
'title' => 'Titel',
'subTitle' => 'Subtitel',
'error' => 'Fehler',
-
+
'showExtern' => 'Für Externe sichtbar machen?',
'survey' => 'Umfrage',
@@ -115,7 +115,7 @@
'section' => 'Sektion',
'showFor' => 'Zeige für',
-
+
'passwordEntry' => 'Passwort zum Eintragen',
'passwordRepeat' => 'Passwort wiederholen',
'passwordDeleteMessage' => 'Um das Passwort zu löschen trage in beide Felder "delete" ein (ohne Anführungszeichen).',
@@ -124,14 +124,14 @@
'public' => 'öffentlich',
'details' => 'Interne Information',
'showOnlyIntern' => 'nur intern sichtbar',
-
+
'backWithoutChange' => 'Ohne Änderung zurück',
-
+
//---------------------------------------------------------------------------------------------------------
-
+
// resources/views/editClubEventView.blade.php
'changeEventJob' => 'Veranstaltung/Aufgabe ändern',
-
+
//Lines for editing only with permission
'noNotThisWay' => 'Ne, das geht so nicht...',
'onlyThe' => 'Nur die',
@@ -141,53 +141,53 @@
'marketingManager' => 'Marketingverantwortlichen',
'canChangeEventJob' => 'dürfen diese Veranstaltung/Aufgabe ändern.',
'commaThe' => ', die ', //line number ~332
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/createSurveyView.blade.php
'createNewSurvey' => 'Neue Umfrage erstellen',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/editSurveyView.blade.php
'editSurvey' => 'Umfrage editieren',
'confirmDeleteSurvey' => 'Möchtest du die Umfrage ":title" wirklich löschen?',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/surveyView.blade.php
'description' => 'Beschreibung',
'surveyDeadlineTo' => 'Die Umfrage läuft noch bis',
'um' => 'um', //better translation needed
-
+
//result messages; can be changed with pluralization
'noPersonAnswered' => 'Es hat noch keine Person abgestimmt.',
'onePersonAnswered' => 'Es hat bereits eine Person abgestimmt.',
'fewPersonAnswered1' => 'Es haben bereits',
'fewPersonAnswered2' => 'Personen abgestimmt.',
-
+
//tableau (head)
'name' => 'Name',
'myClub' => 'Club',
'addMe' => 'Mich eintragen!',
-
+
//Answers
'yes' => 'Ja',
'no' => 'Nein',
'noInformation' => 'keine Angabe',
-
+
'noClub' => 'Extern',
-
+
'confirmDeleteAnswer' => 'Möchtest Du diese Antwort wirklich löschen?',
-
+
//evaluation; can be changed with pluralization
'evaluation' => 'Auswertung',
'personDidNotAnswer' => 'Person wollte keine Angaben machen.',
'personsDidNotAnswer' => 'Personen wollten keine Angaben machen.',
'personAnswered' => 'Person stimmte für',
'personsAnswered' => 'Personen stimmten für',
-
+
//List of Changes
'who' => 'Wer',
'summary' => 'Zusammenfassung',
@@ -195,9 +195,9 @@
'oldValue' => 'Alter Wert',
'newValue' => 'Neuer Wert',
'when' => 'Wann',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/monthView.blade.php
//short weekdays + CW
'Cw' => 'KW',
@@ -221,58 +221,58 @@
// resources/views/monthView.blade.php
'showWeek' => 'Detaillierte Ansicht dieser Woche anzeigen',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/createSurveyView.blade.php
'noEventsThisWeek' => 'Keine Veranstaltungen diese Woche',
'noSurveysThisWeek' => 'Keine Umfragen diese Woche',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/listView.blade.php
'for' => 'Für',
'noEventsPlanned' => 'sind keine Veranstaltungen geplant',
'noEventsOn' => 'Keine Veranstaltungen am',
'EventsFor' => 'Veranstaltungen für',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// resources/views/log.blade.php
// not translated - international view
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials
// /resources/views/partials/clubEventByIdSmall.blade.php
'noResults' => 'Keine Treffer',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/editSchedule.blade.php
'adjustRoster' => 'Dienstplan anpassen',
'serviceTypeEnter' => 'Diensttyp hier eingeben',
'weight' => 'Gewicht (für Statistik)',
'statisticalEvaluation' => 'Statistik',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/filter.blade.php
'allSections' => 'Alle Sektionen',
'comments' => 'Kommentare',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/legend.blade.php
//handled in the event type part in the /resources/views/clubEventView.blade.php part
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/monthCell.blade.php
'internalSurvey' => 'Interne Umfrage',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/navigation.blade.php
'month' => 'Monat',
'week' => 'Woche',
@@ -281,13 +281,13 @@
'manageShiftType' => 'Diensttypen verwalten',
'manageSections' => 'Sektionen verwalten',
// TODO use Job for Service - german: Dienst maybe change to Shift - Schicht
-
+
'manageTemplate' => 'Vorlagen verwalten',
-
+
//create button text
'createNewEvent' => 'Neues Event erstellen',
'createNewSurvey' => 'Neue Umfrage erstellen',
-
+
//Member types
'candidate' => 'Kandidat',
'veteran' => 'Veteran',
@@ -295,12 +295,12 @@
'ex-candidate' => 'ex-Kandidat',
'active' => 'Aktiv',
'external' => 'Extern',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/scheduleEntryName.blade.php
'IDoIt' => 'Ich mache es!', //Ich mach's!
-
+
// /resources/views/partials/scheduleEntryStatus.blade.php
'jobFree' => 'Dienst frei',
@@ -315,46 +315,46 @@
// /resources/views/partials/clubStatistics.blade.php
'infoFor' => 'Mitgliederstatistik',
-
+
// /resources/views/statisticsView.blade.php
'monthStatistic' => 'Monatsstatistik',
'yearStatistic' => 'Jahresstatistik',
// /resources/views/partials/personalStatistics.blade.php
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/surveyAnswerStatus.blade.php
//no new strings
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/surveyForm.blade.php
'showOnlyForLoggedInMember' => 'nur für eingeloggte Nutzer sichtbar',
'showResultsOnlyForCreator' => 'Ergebnisse sind nur für den Umfragenersteller sichtbar',
'showResultsAfterFillOut' => 'Ergebnisse sind erst nach dem Ausfüllen sichtbar',
-
+
'passwordSetOptional' => 'Das Setzen eines Passworts ist optional',
-
+
//Answer and Question options
'answerOption' => 'Antwortmöglichkeit',
'question' => 'Frage',
-
+
//Questionoptions
'freeText' => 'Freitext',
'checkbox' => 'Checkbox',
'dropdown' => 'Dropdown',
-
+
'required' => 'erforderlich',
'addAnswerOption' => 'Antwortmöglichkeit hinzufügen',
'addQuestion' => 'Frage hinzufügen',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/weekCellFull.blade.php
'hide' => 'Ausblenden',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/weekCellHidden.blade.php
'moreDetailsAfterLogInMessage' => 'Weitere Details sind für Mitglieder nach dem Einloggen zugänglich.',
// 'moreDetailsAfterLogInMessage2' => 'nach dem Einloggen zugänglich.',
@@ -362,17 +362,17 @@
// ToDo find a solution
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/weekCellProtected.blade.php
//no new strings
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /resources/views/partials/weekCellSurvey.blade.php
//no new strings
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
// /public/js ToDo add these strings
// Maybe To do translate Javascript, tricky, " " can throw error messages
// /public/js/vedst-script.js
@@ -380,12 +380,12 @@
'errorMessageEnterPasswordForShiftPlan' => 'Bitte noch das Passwort für diesen Dienstplan eingeben:',
'shiftTime' => 'Dienstzeiten',
//'hideTimes' already exists
-
+
'weekStart' => 'Montag - Sonntag',
'hideTakenShifts' => 'Nur FREIe Dienste',
-
+
//-----------------------------------------------------------------------------------------------------------
-
+
//Controller ToDo add these strings
//ShiftController
//action description
@@ -403,29 +403,29 @@
'messageSuccessfulDeleted' => 'Erfolgreich gelöscht!',
//-----------------------------------------------------------------------------------------------------------
-
+
//placeholder strings (e.g. used in buttons or text fields)
-
+
/*
| instead of { trans('message.key' }} use Lang::get('message.key') in the view
*/
-
+
//ClubEvent
'addCommentHere' => 'Kommentar hier hinzufügen',
'enterPasswordHere' => 'Passwort hier eingeben',
'placeholderTitleWineEvening' => 'z.B. Weinabend',
//'placeholderTitleWineEvening'
-
+
'placeholderSubTitleWineEvening'=> 'z.B. Das Leben ist zu kurz, um schlechten Wein zu trinken',
//'placeholderSubTitleWineEvening'
-
+
'placeholderPublicInfo' => 'z.B. Karten nur im Vorverkauf',
'placeholderPrivateDetails' => 'z.B. DJ-Tisch wird gebraucht',
-
+
//Survey
'addAnswerHere' => 'Antwort hier hinzufügen',
'createSurvey' => 'Umfrage erstellen', //Button text
-
+
//Partials
//Navigation
'clubNumber' => 'Clubnummer',
@@ -439,7 +439,7 @@
'placeholderTitleSurvey' => 'z.B. Teilnahme an der Clubfahrt',
'placeholderDescription' => 'Beschreibung:',
'placeholderActiveUntil' => 'Aktiv bis:',
-
+
// Misc.
'guest' => 'Gast',
'accessDenied' => 'Moment mal... Nur eingeloggte Mitglieder mit ausreichender Berechtigung dürfen hier rein! Logge dich ein, oder komm zur nächsten Versammlung und werde Mitglied.',
@@ -491,7 +491,7 @@
//////////
// ICal //
//////////
-
+
'icalfeeds' => 'Kalenderfeed im iCal-Format',
'publishEvent' => 'Event veröffentlichen',
'unpublishEvent' => 'Event aus dem Kalenderfeed entfernen',
diff --git a/resources/lang/en/mainLang.php b/resources/lang/en/mainLang.php
index c4a02b1f8..34719e979 100755
--- a/resources/lang/en/mainLang.php
+++ b/resources/lang/en/mainLang.php
@@ -48,7 +48,7 @@
'marketingFlyersPlacard' => 'Marketing / Flyer / Posters', //used in legend.blade.php
'preSale' => 'Tickets presale',
'others' => 'Others',
- 'faceDone' => 'Facebook event created',
+ 'faceDone' => 'Facebook event done',
'eventUrl' => 'Event link',
'priceTickets' => 'Presales price',
'price' => 'Entrance fee',
@@ -317,7 +317,7 @@
'infoFor' => 'Member statistics',
// /resources/views/partials/personalStatistics.blade.php
-
+
// /resources/views/statisticsView.blade.php
'monthStatistic' => 'monthly Statistics',
'yearStatistic' => 'yearly Statistics',
From f02a6c32430576073b7361f27e1c54250cb00b84 Mon Sep 17 00:00:00 2001
From: fabian
Date: Mon, 29 Jan 2018 22:19:47 +0100
Subject: [PATCH 16/92] don't show additional fields if not set
---
...15_231147_additional_club_event_fields.php | 14 +--
resources/views/clubEventView.blade.php | 110 +++++++++---------
2 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/database/migrations/2017_10_15_231147_additional_club_event_fields.php b/database/migrations/2017_10_15_231147_additional_club_event_fields.php
index db2ebd09e..0ddc43380 100644
--- a/database/migrations/2017_10_15_231147_additional_club_event_fields.php
+++ b/database/migrations/2017_10_15_231147_additional_club_event_fields.php
@@ -14,12 +14,12 @@ class AdditionalClubEventFields extends Migration
public function up()
{
Schema::table('club_events', function (Blueprint $table) {
- $table->boolean("facebook_done")->default(false);
- $table->mediumText("event_url")->default("");
- $table->float("price_tickets_normal");
- $table->float("price_tickets_external");
- $table->float("price_normal");
- $table->float("price_external");
+ $table->boolean("facebook_done")->nullable();
+ $table->mediumText("event_url")->nullable();
+ $table->float("price_tickets_normal")->nullable();
+ $table->float("price_tickets_external")->nullable();
+ $table->float("price_normal")->nullable();
+ $table->float("price_external")->nullable();
});
}
@@ -33,7 +33,7 @@ public function down()
Schema::table('club_events', function (Blueprint $table) {
$table->dropColumn('facebook_done');
$table->dropColumn('event_url');
-
+
$table->dropColumn('price_tickets_normal');
$table->dropColumn('price_tickets_external');
$table->dropColumn('price_normal');
diff --git a/resources/views/clubEventView.blade.php b/resources/views/clubEventView.blade.php
index 4de67dc3e..5f1ec6c02 100644
--- a/resources/views/clubEventView.blade.php
+++ b/resources/views/clubEventView.blade.php
@@ -11,14 +11,14 @@
@elseif ($clubEvent->evnt_type == 1)
- @elseif ($clubEvent->evnt_type == 2
+ @elseif ($clubEvent->evnt_type == 2
OR $clubEvent->evnt_type == 3)
- @elseif ($clubEvent->evnt_type == 4
- OR $clubEvent->evnt_type == 5
+ @elseif ($clubEvent->evnt_type == 4
+ OR $clubEvent->evnt_type == 5
OR $clubEvent->evnt_type == 6)
- @elseif ($clubEvent->evnt_type == 7
+ @elseif ($clubEvent->evnt_type == 7
OR $clubEvent->evnt_type == 8)
@elseif ($clubEvent->evnt_type == 9)
@@ -95,22 +95,24 @@
- + {{-- Internat event metadata --}} @if(Session::has('userId'))
-
- + {{-- Internat event metadata --}} @if(Session::has('userId'))
| - {{ trans('mainLang.faceDone') }}? - | -- @if($clubEvent->facebook_done === 1) - {{ trans('mainLang.yes') }} - @else - {{ trans('mainLang.no') }} - @endif - | -||||||||||||||||||||
| + {{ trans('mainLang.faceDone') }}? + | ++ @if($clubEvent->facebook_done === 1) + {{ trans('mainLang.yes') }} + @else + {{ trans('mainLang.no') }} + @endif + | +||||||||||||||||||||
| @@ -123,33 +125,37 @@ | |||||||||||||||||||||
| - {{ trans('mainLang.priceTickets') }}: - | -
- {{ $clubEvent->price_tickets_normal !== null ? $clubEvent->price_tickets_normal : '--' }} €
- /
- {{ $clubEvent->price_tickets_external !== null ? $clubEvent->price_tickets_external : '--' }} €
-
- - ({{ trans('mainLang.studentExtern') }}) - |
- ||||||||||||||||||||
| - {{ trans('mainLang.price') }}: - | -
- {{ $clubEvent->price_normal !== null ? $clubEvent->price_normal : '--' }} €
- /
- {{ $clubEvent->price_external !== null ? $clubEvent->price_external : '--' }} €
-
- - ({{ trans('mainLang.studentExtern') }}) - |
- ||||||||||||||||||||
| + {{ trans('mainLang.priceTickets') }}: + | +
+ {{ $clubEvent->price_tickets_normal !== null ? $clubEvent->price_tickets_normal : '--' }} €
+ /
+ {{ $clubEvent->price_tickets_external !== null ? $clubEvent->price_tickets_external : '--' }} €
+
+ + ({{ trans('mainLang.studentExtern') }}) + |
+ ||||||||||||||||||||
| + {{ trans('mainLang.price') }}: + | +
+ {{ $clubEvent->price_normal !== null ? $clubEvent->price_normal : '--' }} €
+ /
+ {{ $clubEvent->price_external !== null ? $clubEvent->price_external : '--' }} €
+
+ + ({{ trans('mainLang.studentExtern') }}) + |
+ - @if( $clubEvent->evnt_type === 0) + @if( $clubEvent->evnt_type == 0) {{ trans('mainLang.normalProgramm') }} - @elseif( $clubEvent->evnt_type === 1) + @elseif( $clubEvent->evnt_type == 1) {{ trans('mainLang.information') }} - @elseif( $clubEvent->evnt_type === 2) + @elseif( $clubEvent->evnt_type == 2) {{ trans('mainLang.special') }} - @elseif( $clubEvent->evnt_type === 3) + @elseif( $clubEvent->evnt_type == 3) {{ trans('mainLang.LiveBandDJ') }} - @elseif( $clubEvent->evnt_type === 4) + @elseif( $clubEvent->evnt_type == 4) {{ trans('mainLang.internalEvent') }} - @elseif( $clubEvent->evnt_type === 5) + @elseif( $clubEvent->evnt_type == 5) {{ trans('mainLang.utilization') }} - @elseif( $clubEvent->evnt_type === 6) + @elseif( $clubEvent->evnt_type == 6) {{ trans('mainLang.flooding') }} - @elseif( $clubEvent->evnt_type === 7) + @elseif( $clubEvent->evnt_type == 7) {{ trans('mainLang.flyersPlacard') }} - @elseif( $clubEvent->evnt_type === 8) + @elseif( $clubEvent->evnt_type == 8) {{ trans('mainLang.preSale') }} - @elseif( $clubEvent->evnt_type === 9) + @elseif( $clubEvent->evnt_type == 9) {{ trans('mainLang.others') }} @endif | From df46f4f202387fdfa1d453701c1da5a46e38eba3 Mon Sep 17 00:00:00 2001 From: fabian
- @if($clubEvent->facebook_done === 1)
+ @if($clubEvent->facebook_done == 1)
{{ trans('mainLang.yes') }}
@else
{{ trans('mainLang.no') }}
From e9d759d51aa06f6306c52452fccaa9c77c15e8a5 Mon Sep 17 00:00:00 2001
From: Fabian Markert {{ trans('mainLang.noResults') }}-@else +
{{-- show only a placeholder for private events --}}
@@ -20,4 +18,4 @@
{{ trans('mainLang.club') }}: {{ $clubEvent->section->title }}
 }}){kind=logo}
@else
 }}){kind=logo}
- @endif
+ @endif
+
From e12162d7822d6b256da0159130f2ecfbd18289ee Mon Sep 17 00:00:00 2001
From: fabian
-
+ {{ trans('mainLang.changeEventJob') }}:-
+ -
-
From 6c6ec6260a138f26929feacd9eaf9833f405e507 Mon Sep 17 00:00:00 2001
From: fabian
+
+
-
{!! Form::text('title',
$template->title,
@@ -31,7 +31,7 @@
'style'=>'cursor: auto',
'required') ) !!}
-
+
{!! Form::text('subtitle',
@@ -166,8 +166,8 @@
-
+ + {{ trans('mainLang.moreInfos') }}:diff --git a/resources/views/shifttypes/manageShiftTypesView.blade.php b/resources/views/shifttypes/manageShiftTypesView.blade.php index 5fbeff826..c3ec9f3b7 100644 --- a/resources/views/shifttypes/manageShiftTypesView.blade.php +++ b/resources/views/shifttypes/manageShiftTypesView.blade.php @@ -22,74 +22,76 @@ {{ Form::text('filter','',['class'=>'form-control border', 'placeholder'=>trans('mainLang.search')]) }} {{Form::close()}} -
-
{{ trans('mainLang.changeEventJob') }}:-
- - -
+
{!! Form::text('title',
@@ -32,17 +27,16 @@
'required') ) !!}
-
+
{!! Form::text('subtitle',
$template->subtitle,
array('class'=>'form-control',
'placeholder'=>trans('mainLang.placeholderSubTitleWineEvening'),
'style'=>'cursor: auto') ) !!}
-
+
-
+
@for($i = 0;$i<10;$i++)
- -
+
+
-
- -
+
+
@@ -80,9 +74,9 @@
- ">
-
+
+ ">
+
-
-
+
+
-
@if($template->id == null)
@foreach($sections as $section)
@@ -112,7 +106,7 @@
@endif
+
@@ -129,7 +123,7 @@
-
+
{{ trans('mainLang.price') }}:
@@ -145,22 +139,23 @@
-
-
- {!! Form::input('time', 'preparationTime', $template->time_preparation_start, ['class'=>'form-control']) !!}
+
+
+ {!! Form::input('time', 'preparationTime', $template->time_preparation_start, ['class'=>'form-control ']) !!}
+
- -
-
-
- {{ trans('mainLang.um') }} {!! Form::input('time', 'beginTime', $template->time_start) !!} + +
+
+
-
+ {!! Form::input('time', 'beginTime', $template->time_start, ['class'=>'form-control'] ) !!}
-
-
-
From 081fdc83411ad42e13ca9e2f92cce41c7c23f25f Mon Sep 17 00:00:00 2001
From: fabian {{ trans('mainLang.um') }} {!! Form::input('time', 'endTime', $template->time_end) !!} +
+
+
+ {!! Form::input('time', 'endTime', $template->time_end, ['class'=>'form-control']) !!}
{{ trans('mainLang.management') }}: {{ trans('mainLang.shiftTypes') }}
- {{Form::open( ['id'=>'shiftTypeFilterForm','class'=>'form-inline rounded', 'route'=>'searchShiftType'] ) }}
- {{ Form::text('filter','',['class'=>'form-control border', 'placeholder'=>trans('mainLang.search')]) }}
-
+ {{Form::open( ['id'=>'shiftTypeFilterForm','class'=>' paddingTop form-inline rounded', 'route'=>'searchShiftType'] ) }}
+
+ {{ Form::text('filter','',['class'=>'form-control border', 'placeholder'=>trans('mainLang.search')]) }}
+
+
+
+
{{Form::close()}}
+
|