Congegni/sintonia_webapp
7
0
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' of ssh://git.congegni.net:4022/Congegni/sintonia_webapp into dev

Browse source
This commit is contained in:
Marco Cavalli 2025-04-03 15:01:11 +02:00
commit 36d3deab44
26 changed files with 521 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/Enums/ShowRepeatType.php
View file

@ -15,7 +15,14 @@ enum ShowRepeatType: int
return constant("self::$name");
}
public static function fromValue(int $value){
return constant("self::$value");
public static function fromValue(string $value){
foreach (self::cases() as $case) {
if ($case->value === $value) {
return $case;
}
}
throw new \InvalidArgumentException("No matching UserType found for value: $value");
}
}

37
app/Filters/Show/ShowDaysFilters.php Normal file
View file

@ -0,0 +1,37 @@
<?php
namespace App\Filters\Show;
use App\Filters\FiltersType\IsFilter;
use App\Filters\FiltersType\LikeFilter;
class ShowDaysFilters
{
protected $filters = [
'show_id' => IsFilter::class,
];
public function apply($query, $filters)
{
foreach ($this->receivedFilters($filters) as $name => $value) {
switch ($name) {
case 'all':
$name = array_diff(array_keys($this->filters), ['all']);
$filterInstance = new $this->filters['all']();
break;
default:
$filterInstance = new $this->filters[$name]();
break;
}
$query = $filterInstance($query, $name, $value);
}
return $query;
}
public function receivedFilters($filters)
{
return $filters->only(array_keys($this->filters));
}
}

10
app/Helpers/CarbonShowRepetition.php
View file

@ -40,6 +40,7 @@ class CarbonShowRepetition
while ($currentDate->lte($dateStopInterval)) {
if ($repeatTypeEnum === ShowRepeatType::monthly) {
$nextMonth = $currentDate->addMonth();
// With a flag we can skip this check and repeating based on the given month number
if ($nextMonth->day > $currentDate->day) {
$nextMonth->day = $currentDate->day;
}
@ -52,4 +53,13 @@ class CarbonShowRepetition
return $dates;
}
public static function getNextStartDate(string $showFirstDate, int $showDayNumber): Carbon {
$date = Carbon::createFromFormat('Y-m-d', $showFirstDate);
$dayOfWeek = $date->dayOfWeek;
if($dayOfWeek != $showDayNumber){
$date = $date->next($showDayNumber);
}
return $date;
}
}

17
app/Http/Controllers/Show/ShowController.php
View file

@ -42,16 +42,17 @@ class ShowController extends Controller
public function store(Request $request)
{
try {
$showInfos = $request->show;
$showDaysRules = $request->showDaysRules;
$showDjs = $request->showDjs;
$show = Show::firstOrCreate($showInfos);
$this->manageShowDays($show, $showDaysRules);
$this->manageShowDjs($showDjs, $show);
}catch(Exception $e){
$showData = $request->all();
$showDays = $showData['show_days'];
$showDJs = $showData['show_djs'];
$this->createShow($showData, $showDays, $showDJs);
return response()->json([
'status' => 'success',
'message' => 'Show saved successfully!'
]);
} catch (Exception $e) {
return response()->json(['message' => $e->getMessage()], 500);
}
return response()->json(['message' => 'Show created successfully']);
}
public function show(ShowResource $show)

49
app/Http/Controllers/Show/ShowDaysController.php Normal file
View file

@ -0,0 +1,49 @@
<?php
namespace App\Http\Controllers\Show;
use App\Filters\Show\ShowFilters;
use App\Http\Controllers\Controller;
use App\Http\Requests\ShowDaysRequest;
use App\Http\Resources\ShowDaysResource;
use App\Models\Show\Show;
use App\Models\Show\ShowDays;
use App\Traits\Show\ShowDaysTrait;
use Illuminate\Http\ReqshowDaysFlatest;
use Illuminate\Http\Request;
class ShowDaysController extends Controller
{
use ShowDaysTrait;
public function index(Request $request)
{
$queryParams = collect($request->except('flattenShowDays'));
$showDays = (new ShowDays())->searchFilter($queryParams)->get();
if($request->flattenShowDays) $showDays = $this->showDaysFlat($showDays);
return response()->json($showDays);
}
public function store(ShowDaysRequest $request)
{
return new ShowDaysResource(ShowDays::create($request->validated()));
}
public function show(ShowDays $ShowDays)
{
return new ShowDaysResource($ShowDays);
}
public function update(ShowDaysRequest $request, ShowDays $ShowDays)
{
$ShowDays->update($request->validated());
return new ShowDaysResource($ShowDays);
}
public function destroy(ShowDays $ShowDays)
{
$ShowDays->delete();
return response()->json();
}
}

6
app/Models/Show/ShowDays.php
View file

@ -2,6 +2,7 @@
namespace App\Models\Show;
use App\Filters\Show\ShowDaysFilters;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes;
@ -41,4 +42,9 @@ class ShowDays extends Model
{
return $this->belongsTo(Show::class, 'show_id');
}
public function scopeSearchFilter($query, $request) {
$filters = new ShowDaysFilters();
return $filters->apply($query, $request);
}
}

68
app/Traits/Show/ShowDaysTrait.php
View file

@ -3,9 +3,12 @@
namespace App\Traits\Show;
use App\Enums\ShowRepeatType;
use App\Helpers\CarbonShowRepetition;
use App\Helpers\Preferences;
use App\Lib\RabbitMQSender;
use Illuminate\Support\Collection;
Trait ShowDaysTrait
trait ShowDaysTrait
{
/**
* Each show may have a repetition rules, we set them in the db
@ -13,42 +16,43 @@ Trait ShowDaysTrait
* @param $showDaysRules
*
* @return void
* @throws \Exception
*/
public function createShowDays($show, $showDays)
public function createShowDays($show, $showDays): void
{
for ($i = 0; $i < count($showDays['day']); $i++) {
$showDay = $showDays;
$showDay['repeat_type'] = ShowRepeatType::fromName($showDays['repeat_type']);
$showDay['day'] = $showDays['day'][$i];
// Check if showDay already exists for this day and show ID
$existingShowDay = $show->showDays()->where('day', $showDay['day'])->first();
if ($existingShowDay) {
$existingShowDay->update([
'first_show' => $showDay['first_show'],
'start_time' => $showDay['start_time'],
'timezone' => $showDay['timezone'],
'duration' => $showDay['duration'],
'repeat_type' => $showDay['repeat_type']->value,
]);
continue;
try {
// TODO this is incorrect, look up the preference helper, getDefaultTimezone is called statically but it should not
$timezone = config('app.timezone');
foreach ($showDays['day'] as $day) {
$showDay = $showDays;
$showDay['first_show'] = CarbonShowRepetition::getNextStartDate($showDays['first_show'], $day);
$showDay['repeat_type'] = ShowRepeatType::fromName($showDays['repeat_type'])->value;
$showDay['day'] = $day;
$show->showDays()->create(
[
'first_show' => $showDay['first_show'],
'start_time' => $showDay['start_time'],
'timezone' => $showDay['timezone'],
'duration' => $showDay['duration'],
'repeat_type' => $showDay['repeat_type'],
'day' => $showDay['day'],
'timezone' => $timezone,
]
);
}
$show->showDays()->create($showDay);
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
}
}
public function manageShowDays($show, $showDays)
{
// TODO Determine if the show days rules have been changed
// By editing the createShowDays, returning the days on which the rules have been changed
// one could trigger the creation of only specific instances
// The hard part relies on finding out which show instances
// belong to which showDays rules, as they do not have any fk to showDays
// Probably its complexity is higher than its advantages
// if it is, then proceed to edit the show days rules and generate the show instances
$this->createShowDays($show, $showDays);
$this->manageShowInstances($show);
RabbitMQSender::SendMessageToPypo('update_schedule', []);
public function showDaysFlat(Collection $showDays): array {
$baseProps = $showDays->first()->toArray();
$earliestDate = $showDays->min('first_show');
$daysArray = $showDays->pluck('day')->toArray();
return array_merge($baseProps, [
'first_show' => $earliestDate,
'day' => $daysArray,
]);
}
}

31
app/Traits/Show/ShowDjTrait.php
View file

@ -11,7 +11,7 @@ trait ShowDjTrait
/**
* @throws Exception
*/
public function manageShowDjs(array $showDjs, Show $show)
public function manageShowDjs(Show $show, array $showDjs)
{
// TODO Add protection so only Editor and Admin can edit the djs
@ -22,21 +22,26 @@ trait ShowDjTrait
}
}
// Fetch current DJs for the show
$currentDjs = $show->showDjs()->pluck('subjs_id')->toArray();
try {
// Fetch current DJs for the show
$currentDjs = $show->showDjs()->pluck('subjs_id')->toArray();
// Compute the difference
$djsToAdd = array_diff($showDjs, $currentDjs);
$djsToRemove = array_diff($currentDjs, $showDjs);
// Compute the difference
$djsToAdd = array_diff($showDjs, $currentDjs);
$djsToRemove = array_diff($currentDjs, $showDjs);
// Remove DJs not in the list
foreach ($djsToRemove as $djId) {
$show->showDjs()->where('subjs_id', $djId)->delete();
// Remove DJs not in the list
foreach ($djsToRemove as $djId) {
$show->showDjs()->where('subjs_id', $djId)->delete();
}
// Add new DJs
foreach ($djsToAdd as $djId) {
$show->showDjs()->make(['subjs_id' => $djId]);
}
} catch (\Exception $e) {
return $e->getMessage();
}
// Add new DJs
foreach ($djsToAdd as $djId) {
$show->showDjs()->updateOrCreate(['subjs_id' => $djId]);
}
}
}

79
app/Traits/Show/ShowInstancesTrait.php
View file

@ -6,6 +6,7 @@ use App\Helpers\CarbonShowRepetition;
use App\Helpers\LengthFormatter;
use App\Http\Resources\ShowResource;
use App\Models\Preference;
use App\Models\Show\Show;
use App\Models\ShowInstances\ShowInstances;
use Carbon\Carbon;
use Carbon\CarbonInterval;
@ -18,33 +19,31 @@ trait ShowInstancesTrait
*/
public function checkOverlappingInstances(array $instancesDates, $duration, int $showId): void
{
$existingRanges = ShowInstances::where('show_id', '!=', $showId)
->get(['starts', 'ends'])
->map(fn($i) => [$i->starts, $i->ends]);
foreach ($instancesDates as $date) {
$instanceStartDate = $date;
$instanceEndDate = clone $date;
$instanceEndDate->addHours($duration);
$newStart = $date;
$newEnd = (clone $date)->addHours($duration);
// Query to check for overlaps
$overlapExists = ShowInstances::where(
function ($query) use ($instanceStartDate, $instanceEndDate, $showId) {
$query->where('starts', '<=', $instanceEndDate)
->where('ends', '>=', $instanceStartDate)
->where('show_id','!=', $showId);
}
)->exists();
$hasOverlap = $existingRanges->contains(
fn($range) => $newStart < $range[1] && $newEnd > $range[0]
);
if ($overlapExists) {
throw new Exception('Overlapping shows'); // Overlap found
if ($hasOverlap) {
throw new Exception("Overlap detected between $newStart and $newEnd");
}
}
}
public function createShowInstances($instancesDates, $showDay, $show)
public function createShowInstances($instancesDates, $showDayDuration, $showId)
{
$showInstances = [];
foreach ($instancesDates as $instanceDate) {
$showStartDate = $instanceDate->copy();
$duration = CarbonInterval::createFromFormat('H:i:s', $showDay->duration);
$duration = CarbonInterval::createFromFormat('H:i', $showDayDuration);
$showEndDate = $showStartDate->copy()->add($duration);
$timeFilled = LengthFormatter::generateStringTimeFilled($showStartDate, $showEndDate);
@ -53,7 +52,7 @@ trait ShowInstancesTrait
$showInstances[] = [
'starts' => $showStartDate,
'ends' => $showEndDate,
'show_id' => $show->id,
'show_id' => $showId,
'record' => 0,
'rebroadcast' => 0,
'time_filled' => $timeFilled,
@ -73,34 +72,36 @@ trait ShowInstancesTrait
* @param ShowResource $ShowResource
*
* @return void
* @throws \Exception
* @throws Exception
*/
public function manageShowInstances($show)
public function manageShowInstances(Show $show)
{
$showDays = $show->showDays;
$generationLimitDate = Preference::where('keystr', 'shows_populated_until')->value('valstr');
$generationLimitDate = Carbon::createFromFormat('Y-m-d H:i:s', $generationLimitDate);
$showInstances = [];
try {
$generationLimitDate = Preference::where('keystr', 'shows_populated_until')->value('valstr');
$generationLimitDate = Carbon::createFromFormat('Y-m-d H:i:s', $generationLimitDate);
$showInstances = [];
foreach ($show->showDays as $showDay) {
try {
$lastShowDate = $showDay->last_show ?? $generationLimitDate;
$instancesDates = CarbonShowRepetition::generateDates(
$showDay->repeat_type,
$showDay->first_show,
$showDay->start_time,
$lastShowDate
);
foreach ($showDays as $showDay) {
try {
$lastShowDate = $showDay->last_show ?? $generationLimitDate;
$instancesDates = CarbonShowRepetition::generateDates(
$showDay->repeat_type,
$showDay->first_show,
$showDay->start_time,
$lastShowDate
);
$this->checkOverlappingInstances($instancesDates, $showDay->duration, $show->id);
$this->checkOverlappingInstances($instancesDates, $showDay->duration, $show->id);
$showInstances[] = $this->createShowInstances($instancesDates, $showDay, $show);
} catch (\Exception $e) {
throw new \Exception($e->getMessage(), 500);
$showInstances[] = $this->createShowInstances($instancesDates, $showDay->duration, $show->id);
} catch (Exception $e) {
throw new Exception($e->getMessage(), 500);
}
}
}
foreach ($showInstances as $showInstance) {
$show->showInstances()->createMany($showInstance);
foreach ($showInstances as $showInstance) {
$show->showInstances()->createMany($showInstance);
}
} catch (Exception $e) {
throw new Exception($e->getMessage(), 500);
}
}
}

34
app/Traits/Show/ShowTrait.php
View file

@ -2,7 +2,39 @@
namespace App\Traits\Show;
use App\Lib\RabbitMQSender;
use App\Models\Show\Show;
use App\Models\Show\ShowHosts;
use Illuminate\Support\Facades\DB;
trait ShowTrait
{
/**
* @param array $showData
* @param ShowDays[] $showDays
* @param ShowHosts[] $showDJs
*
* @return string|void
* @throws \Exception
*/
public function createShow(array $showData, array $showDays, array|null $showDJs)
{
try {
DB::beginTransaction();
$show = Show::create($showData);
$this->createShowDays($show, $showDays);
if (isset($showDJs)) {
$this->manageShowDjs($show, $showDJs);
}
$this->manageShowInstances($show);
$show->save();
DB::commit();
RabbitMQSender::SendMessageToPypo('update_schedule', []);
} catch (\Exception $e) {
DB::rollBack();
throw new \Exception($e->getMessage());
} catch (\Throwable $e) {
throw new \Exception($e->getMessage());
}
}
}

25
resources/js/components/content/Dashboard.vue
View file

@ -1,20 +1,21 @@
<script setup lang="ts">
import CalendarShowEvent from "@/components/content/partials/CalendarShowEvent.vue";
import {computed, onMounted, type Ref, ref} from "vue";
import {useAuthStore} from "@/stores/auth.store.ts";
import ShowCreateEditForm from "@partials/show/ShowCreateEditForm.vue";
import {baseShow, deleteShow} from "@models/show/show.ts";
import type {calendarShowEvent} from "@models/misc/calendarShowEvent.ts";
import { nextTick } from "vue";
import {baseShowInstance, getShowInstances, type ShowInstance} from "@models/show/showInstance.ts";
import {setShowInstancesForCalendar} from "@/composables/content/dashboard_page.ts";
import {baseShowDays, getShowDays} from "@models/show/showDays.ts";
import type {calendarShowEvent} from "@models/misc/calendarShowEvent.ts";
import ShowInstanceForm from "@partials/show/ShowInstanceForm.vue";
import ShowForm from "@partials/show/ShowForm.vue";
import CalendarShowEvent from "@partials/show/CalendarShowEvent.vue"
import {extractTime} from "@/helpers/DateFormatter.ts";
// Store
const auth = useAuthStore();
const userRole = auth.userData.user.role;
// Data
const editMode = ref(false);
const showCreateEditMode = ref(false);
const showInstanceCreateEditMode = ref(false);
@ -22,6 +23,9 @@ const showInstances = ref<ShowInstance[]>([]);
let showSelected = ref(baseShow());
let selectedShowInstance = ref(baseShowInstance());
const shows: Ref<calendarShowEvent[]> = computed(() => setShowInstancesForCalendar(showInstances.value));
// Funcs
onMounted(async () => {
const today = new Date();
const startOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 1);
@ -33,9 +37,6 @@ onMounted(async () => {
showInstances.value = await getShowInstances(options);
});
const shows: Ref<calendarShowEvent[]> = computed(() => setShowInstancesForCalendar(showInstances.value));
const toggleEditMode = () => {
editMode.value = !editMode.value;
};
@ -51,7 +52,11 @@ const contextMenuEditInstance = (showInstanceId: number) => {
const contextMenuEditShow = async (showInstanceId: number) => {
showSelected.value = showInstances.value[showInstanceId].show;
showSelected.value.showDays = await getShowDays({showId: showSelected.value.id, flattenShowDays: true});
let showDaysRules = await getShowDays({show_id: showSelected.value.id, flattenShowDays: true});
showDaysRules.firstShow = new Date(showDaysRules.firstShow);
// TODO Timezone problems
showDaysRules.startTime = extractTime(showDaysRules.startTime, true);
showSelected.value.showDays = showDaysRules;
showCreateEditMode.value = true;
};
@ -79,7 +84,7 @@ const resetItemEdited = () => {
<template>
<template v-if="showCreateEditMode || showInstanceCreateEditMode">
<ShowCreateEditForm v-if="showCreateEditMode" :show="showSelected" @go-back="resetItemEdited" />
<ShowForm v-if="showCreateEditMode" :show="showSelected" @go-back="resetItemEdited" />
<ShowInstanceForm v-if="showInstanceCreateEditMode" :showInstance="selectedShowInstance" @toggle-menu-edit-instance="toggleMenuEditInstance" />
</template>
<template v-else>

4
resources/js/components/content/Show.vue
View file

@ -3,7 +3,7 @@ import {reactive, ref, watch} from "vue";
import Table from "@partials/Table.vue";
import ConfirmDelete from "@partials/dialogs/ConfirmDelete.vue";
import {show_page} from "@/composables/content/show/show_page.ts";
import ShowCreateEditForm from "@partials/show/ShowCreateEditForm.vue";
import ShowForm from "@partials/show/ShowForm.vue";
import {baseShow, type Show} from "@models/show/show";
const {items, listData, headers, selected, loading, search, getItems, editItem, deleteItem} = show_page()
@ -82,7 +82,7 @@ watch(search, (newValue, oldValue) => {
</script>
<template>
<ShowCreateEditForm
<ShowForm
v-if="showSelected.id !== null && !dialog.open"
:show="showSelected"
@go-back="resetItemEdited"

11
resources/js/components/content/partials/fields/show/DaysCheckbox.vue
View file

@ -1,8 +1,16 @@
<script setup lang="ts">
import {WeekDaysData} from "@models/show/ShowRepetition.ts";
import type {PropType} from "vue";
import type {Show} from "@models/show/show.ts";
const selectedDays = defineModel()
const props = defineProps({
fixedDay: {
type: Number,
required: false,
},
});
</script>
<template>
@ -14,6 +22,7 @@ const selectedDays = defineModel()
v-model="selectedDays"
:label="day.dayName"
:value="day.type"
:disabled="day.type === props.fixedDay"
/>
</v-col>
</v-row>

26
resources/js/components/content/partials/fields/show/ShowStartEndTime.vue
View file

@ -2,7 +2,8 @@
import {onMounted, type PropType} from "vue";
import { ref, watch } from 'vue';
import {getShowInstances} from "@models/show/showInstance.ts";
import {getHoursMinutesFromString, getTimeDiff} from "@/helpers/DateFormatter.ts";
// Emits, props and models
const emits = defineEmits(['update:duration'])
const props = defineProps({
@ -25,37 +26,26 @@ const props = defineProps({
})
const startTime = defineModel({default: '08:00'});
// Data
const duration = ref('0:0');
const endTime = ref('');
const startMenu = ref(false);
const endMenu = ref(false);
const getDuration = (startTime: Date, endTime: Date) => {
const diffInMilliseconds = Math.abs(startTime.getTime() - endTime.getTime());
const remainingHours = Math.floor((diffInMilliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
const remainingMinutes = Math.floor((diffInMilliseconds % (1000 * 60 * 60)) / (1000 * 60));
return `${remainingHours}:${remainingMinutes}`;
};
const getHoursMinutes = (timeString: string) => {
const [ h, m ] = timeString.split(":");
const ms = new Date().setHours(h,m);
return new Date(ms)
};
// Func
const checkTime = () => {
if (startTime.value && endTime) {
const start = getHoursMinutes(startTime.value);
let end = getHoursMinutes(endTime.value);
const start: Date = getHoursMinutesFromString(startTime.value);
let end: Date = getHoursMinutesFromString(endTime.value);
if (end.getTime() <= start.getTime()) {
end = new Date(start);
end.setMinutes(start.getMinutes() + 60);
endTime.value = end.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit' });;
}
duration.value = getDuration(start, end);
duration.value = getTimeDiff(start, end);
emits('update:duration', duration.value);
}
}

2
resources/js/components/content/partials/CalendarShowEvent.vue → resources/js/components/content/partials/show/CalendarShowEvent.vue
View file

@ -3,7 +3,7 @@ import type { PropType} from "vue";
import type {ContextMenuType} from "@models/misc/contextMenu"
import type {calendarShowEvent, ShowEventActionTrigger} from "@models/misc/calendarShowEvent.ts";
import {calendarShowEventMenu} from "@models/misc/calendarShowEvent";
import {ref, computed, onMounted} from 'vue';
import { ref } from 'vue';
import ContextMenu from '@partials/ContextMenu.vue';
const emit = defineEmits([

84
resources/js/components/content/partials/show/ShowCreateEditForm.vue → resources/js/components/content/partials/show/ShowForm.vue
View file

@ -7,6 +7,7 @@ import {getUser} from "@models/User.ts";
import {getPlaylist} from "@models/playlist.ts";
import ColorPickerButton from "@partials/fields/misc/ColorPickerButton.vue";
// Props
const props = defineProps({
show: {
type: Object as PropType<Show>,
@ -14,18 +15,22 @@ const props = defineProps({
},
});
// Data
let usersDJs = ref([])
let playlists = ref([])
const isLoading = ref(false);
const loading = ref(false);
const showScheduleFormMode = ref(false);
const isFormValid = ref(false);
// Store
const showStore = useShowStore()
showStore.loadShow(props.show)
const showFormStore = useShowStore()
// Funcs
onMounted(async () => {
isLoading.value = true
await showFormStore.loadShow(props.show)
loading.value = true
usersDJs.value = await getUser({role: 'dj'});
playlists.value = await getPlaylist({});
isLoading.value = false
loading.value = false
})
const toggleScheduleForm = () => {
@ -34,32 +39,45 @@ const toggleScheduleForm = () => {
</script>
<template>
<v-card>
<v-card
:disabled="loading"
:loading="loading"
>
<template v-slot:loader="{ isActive }">
<v-progress-linear
:active="isActive"
color="deep-purple"
height="4"
indeterminate
></v-progress-linear>
</template>
<v-card-title>
<h3>Trasmissione</h3>
</v-card-title>
<template v-if="showScheduleFormMode">
<ShowScheduleForm
v-model="showFormStore.currentShow.showDays"
v-model="showStore.currentShow.showDays"
@toggle-show-schedule-form="toggleScheduleForm"
@save-show-schedule="showFormStore.saveSchedule"
@trigger-show-creation="showStore.createShow"
/>
</template>
<template v-else>
<v-form>
<v-form ref="form" v-model="isFormValid">
<v-card-text>
<v-row no-gutters>
<!-- Name Field -->
<v-col cols="12" md="6" lg="4">
<v-card>
<v-text-field
v-model="showFormStore.currentShow.name"
v-model="showStore.currentShow.name"
label="Nome"
density="compact"
:required="true"
@update:modelValue="value => showFormStore.updateField({ key: 'name', value })"
@update:modelValue="value => showStore.updateField({ key: 'name', value })"
:rules="[v => !!v || 'Nome è obbligatorio']"
required="true"
/>
</v-card>
</v-col>
@ -68,11 +86,11 @@ const toggleScheduleForm = () => {
<v-col cols="12" md="6" lg="4">
<v-card>
<v-text-field
v-model="showFormStore.currentShow.url"
v-model="showStore.currentShow.url"
label="URL"
density="compact"
:required="true"
@update:modelValue="value => showFormStore.updateField({ key: 'url', value })"
@update:modelValue="value => showStore.updateField({ key: 'url', value })"
/>
</v-card>
</v-col>
@ -81,11 +99,11 @@ const toggleScheduleForm = () => {
<v-col cols="12" md="6" lg="4">
<v-card>
<v-text-field
v-model="showFormStore.currentShow.genre"
v-model="showStore.currentShow.genre"
label="Genere"
density="compact"
:required="true"
@update:modelValue="value => showFormStore.updateField({ key: 'genre', value })"
@update:modelValue="value => showStore.updateField({ key: 'genre', value })"
/>
</v-card>
</v-col>
@ -94,11 +112,11 @@ const toggleScheduleForm = () => {
<v-col cols="12" md="6" lg="4">
<v-card>
<v-textarea
v-model="showFormStore.currentShow.description"
v-model="showStore.currentShow.description"
label="Descrizione"
density="compact"
rows="2"
@update:modelValue="value => showFormStore.updateField({ key: 'description', value })"
@update:modelValue="value => showStore.updateField({ key: 'description', value })"
/>
</v-card>
</v-col>
@ -107,9 +125,9 @@ const toggleScheduleForm = () => {
<v-col cols="12" md="6" lg="4">
<v-card>
<ColorPickerButton
v-model="showFormStore.currentShow.backgroundColor"
v-model="showStore.currentShow.backgroundColor"
label="Colore di sfondo"
@update:modelValue="value => showFormStore.updateField({ key: 'backgroundColor', value })"
@update:modelValue="value => showStore.updateField({ key: 'backgroundColor', value })"
/>
</v-card>
</v-col>
@ -118,11 +136,11 @@ const toggleScheduleForm = () => {
<v-col cols="12" md="6" lg="4">
<v-card>
<v-file-input
v-model="showFormStore.currentShow.imagePath"
v-model="showStore.currentShow.imagePath"
label="Percorso immagine"
density="compact"
type="file"
@update:modelValue="value => showFormStore.updateField({ key: 'imagePath', value })"
@update:modelValue="value => showStore.updateField({ key: 'imagePath', value })"
/>
</v-card>
</v-col>
@ -133,24 +151,24 @@ const toggleScheduleForm = () => {
<v-card>
<v-checkbox
label="Attivare regole di ripetizione?"
v-model="showFormStore.currentShow.hasAutoplaylist"
v-model="showStore.currentShow.hasAutoplaylist"
></v-checkbox>
<v-checkbox
v-model="showFormStore.currentShow.autoplaylistRepeat"
v-model="showStore.currentShow.autoplaylistRepeat"
label="Ripetere playlist?"
:disabled="!showFormStore.currentShow.hasAutoplaylist"
@update:modelValue="value => showFormStore.updateField({ key: 'autoplaylistRepeat', value })"
:disabled="!showStore.currentShow.hasAutoplaylist"
@update:modelValue="value => showStore.updateField({ key: 'autoplaylistRepeat', value })"
/>
<v-select
v-model="showFormStore.currentShow.autoplaylist_id"
v-model="showStore.currentShow.autoplaylistId"
:items="playlists"
label="Playlist"
density="compact"
item-title="name"
item-value="id"
:disabled="!showFormStore.currentShow.hasAutoplaylist"
@update:modelValue="value => showFormStore.updateField({ key: 'autoplaylistId', value })"
:disabled="!showStore.currentShow.hasAutoplaylist"
@update:modelValue="value => showStore.updateField({ key: 'autoplaylistId', value })"
/>
</v-card>
</v-card>
@ -160,14 +178,14 @@ const toggleScheduleForm = () => {
<v-col cols="12" md="6" lg="4">
<v-card>
<v-select
v-model="showFormStore.currentShow.showDjs"
v-model="showStore.currentShow.showDjs"
:items="usersDJs"
label="DJs"
density="compact"
item-title="login"
item-value="id"
multiple
@update:modelValue="value => showFormStore.updateField({ key: 'showDjs', value })"
@update:modelValue="value => showStore.updateField({ key: 'showDjs', value })"
/>
</v-card>
</v-col>
@ -176,8 +194,8 @@ const toggleScheduleForm = () => {
<v-card-actions>
<v-btn color="accent" @click="$emit('goBack')">Torna indietro</v-btn>
<v-btn color="accent" @click="showFormStore.saveShow">Salva</v-btn>
<v-btn color="accent" @click="toggleScheduleForm">Salva e schedula</v-btn>
<v-btn v-if="showStore.currentShow.id" color="accent" @click="showStore.updateShow()" :disabled="!isFormValid" >Salva</v-btn>
<v-btn color="accent" @click="toggleScheduleForm" :disabled="!isFormValid" >Regole di programmazione</v-btn>
</v-card-actions>
</v-form>
</template>

89
resources/js/components/content/partials/show/ShowScheduleForm.vue
View file

@ -1,39 +1,65 @@
<script setup lang="ts">
<script setup lang="ts">
import {onMounted, ref, watch} from 'vue';
import {useShowStore} from "@/stores/show.store.ts";
import {showRepetitionData} from "@models/show/ShowRepetition.ts";
import DaysCheckbox from "@partials/fields/show/DaysCheckbox.vue";
import ShowStartEndTime from "@partials/fields/show/ShowStartEndTime.vue";
const emits =defineEmits(['toggle-show-schedule-form'])
// Emits and props
const emits = defineEmits(['toggle-show-schedule-form', 'trigger-show-creation'])
const showFormStore = useShowStore();
// Store
const showStore = useShowStore();
// Data
const checkBoxEnd = ref(false)
const checkBoxRepetition = ref(false)
const isFormValid = ref(false)
// Funcs
onMounted(() => {
const startDayShow = showStore.currentShow.showDays.firstShow.getDay();
let showDays = checkBoxRepetition.value ? showStore.currentShow.showDays.day : [];
showDays.push(startDayShow);
showStore.updateShowDaysField({ key: 'day', value: showDays });
});
const updateShowStartDay = (newStartDate) => {
const previousStartDayShow = showStore.currentShow.showDays.firstShow.getDay();
let showDays = showStore.currentShow.showDays.day.filter((item) => item !== previousStartDayShow);
showStore.updateShowDaysField({ key: 'firstShow', value: newStartDate });
const newStartDayShow = newStartDate.getDay();
showDays.push(newStartDayShow);
showStore.updateShowDaysField({ key: 'day', value: showDays });
};
const goBack = () => {
// showFormStore.resetShowDays();
emits("toggle-show-schedule-form");
};
const saveShowSchedule = () => {
showFormStore.saveSchedule();
const saveShowSchedule = async () => {
if (showStore.currentShow.id) {
return await showStore.updateShowDays();
}
emits('trigger-show-creation')
};
const checkBoxEnd = ref(false)
const checkBoxRepetition = ref(false)
watch(checkBoxEnd, (checkBoxEnd) => {
if(checkBoxEnd == false) showFormStore.updateShowDaysField({ key: 'lastShow', value: null })
if(checkBoxEnd == false) showStore.updateShowDaysField({ key: 'lastShow', value: null })
})
watch(checkBoxRepetition, (checkBoxRepetition) => {
if(checkBoxRepetition == false) {
showFormStore.updateShowDaysField({key: 'day', value: []})
// TODO By restoring the noRepeat from the day enum
// one can toggle it's visibility based on the select box disabled value
// Only cosmetic
showFormStore.updateShowDaysField({key: 'repeatType', value: -1})
watch(checkBoxRepetition, (newValue) => {
if (!newValue) {
const startDayShow = showStore.currentShow.showDays.firstShow.getDay();
showStore.updateShowDaysField({ key: 'day', value: [startDayShow] });
showStore.updateShowDaysField({ key: 'repeatType', value: 'noRepeat' });
}
})
});
// TODO Create a fixed selected day for repetition extracted from the start date
// Create a local ref var that get's the day number from the startDate, pass it
// to the days component as a fixed date
</script>
<template>
@ -41,18 +67,19 @@ watch(checkBoxRepetition, (checkBoxRepetition) => {
<v-card-title>
<h3>Regole di programmazione</h3>
</v-card-title>
<v-form>
<v-form ref="form" v-model="isFormValid">
<v-card-text>
<v-row no-gutters>
<!-- First Show Date -->
<v-col cols="12" md="6" lg="4">
<v-date-picker
v-model="showFormStore.currentShow.showDays.firstShow"
:value="showStore.currentShow.showDays.firstShow"
:min="new Date().toISOString().substring(0, 10)"
:title="'Data inizio'"
label="Data inizio"
density="compact"
@update:modelValue="value => showFormStore.updateShowDaysField({ key: 'firstShow', value })"
required="true"
v-on:update:modelValue="updateShowStartDay"
/>
</v-col>
@ -63,8 +90,8 @@ watch(checkBoxRepetition, (checkBoxRepetition) => {
v-model="checkBoxEnd"
></v-checkbox>
<v-date-picker
v-model="showFormStore.currentShow.showDays.lastShow"
:min="showFormStore.currentShow.showDays.firstShow"
:v-model="showStore.currentShow.showDays.lastShow"
:min="showStore.currentShow.showDays.firstShow"
label="Data fine"
title="Data fine"
density="compact"
@ -75,11 +102,12 @@ watch(checkBoxRepetition, (checkBoxRepetition) => {
<!-- Start Time and Duration -->
<v-col cols="12" md="6" lg="4">
<ShowStartEndTime
v-model="showFormStore.currentShow.showDays.startTime"
v-model="showStore.currentShow.showDays.startTime"
:start-time-label="'Ora inizio show'"
:duration-label="'Durata'"
:end-time-label="'Orario di fine della trasmissione'"
@update:duration="value => showFormStore.updateShowDaysField({ key: 'duration', value })"
@update:duration="value => showStore.updateShowDaysField({ key: 'duration', value })"
required="true"
/>
</v-col>
@ -90,7 +118,7 @@ watch(checkBoxRepetition, (checkBoxRepetition) => {
v-model="checkBoxRepetition"
></v-checkbox>
<v-select
v-model="showFormStore.currentShow.showDays.repeatType"
v-model="showStore.currentShow.showDays.repeatType"
:items="showRepetitionData"
label="Ripetizione"
density="compact"
@ -100,10 +128,11 @@ watch(checkBoxRepetition, (checkBoxRepetition) => {
/>
<DaysCheckbox
v-model="showFormStore.currentShow.showDays.day"
v-model="showStore.currentShow.showDays.day"
:disabled="!checkBoxRepetition || (showStore.currentShow.showDays.repeatType === 'noRepeat')"
:fixedDay="showStore.currentShow.showDays.firstShow.getDay()"
@update:modelValue="value => showStore.updateShowDaysField({ key: 'day', value })"
label="Giorni"
:disabled="!checkBoxRepetition"
@update:modelValue="value => showFormStore.updateShowDaysField({ key: 'day', value })"
/>
</v-col>
</v-row>
@ -111,7 +140,7 @@ watch(checkBoxRepetition, (checkBoxRepetition) => {
<v-card-actions>
<v-btn color="accent" @click="goBack">Torna indietro</v-btn>
<v-btn color="accent" @click="saveShowSchedule">Salva</v-btn>
<v-btn color="accent" @click="saveShowSchedule" :disabled="!isFormValid">Salva</v-btn>
</v-card-actions>
</v-form>
</v-card>

40
resources/js/composables/content/models/show/ShowRepetition.ts
View file

@ -1,33 +1,31 @@
enum ShowRepeatEnum {
Weekly = 0,
Biweekly = 1,
Triweekly = 4,
FourWeeks = 5,
Monthly = 2,
// TODO i18n strings
export enum ShowRepeatEnum {
weekly = 'Weekly',
biweekly = 'Biweekly',
triweekly = 'Triweekly',
fourWeeks = 'Four weeks',
monthly = 'Monthly',
noRepeat = 'No repeat',
}
export interface ShowRepetitionType {
type: ShowRepeatEnum;
repeatName: string
}
export const showRepetitionData: ShowRepetitionType[] = [
{ type: ShowRepeatEnum.Weekly, repeatName: "Weekly" },
{ type: ShowRepeatEnum.Biweekly, repeatName: "Biweekly" },
{ type: ShowRepeatEnum.Triweekly, repeatName: "Triweekly" },
{ type: ShowRepeatEnum.FourWeeks, repeatName: "Four Weeks" },
{ type: ShowRepeatEnum.Monthly, repeatName: "Monthly" },
];
export const showRepetitionData: ShowRepetitionType[] = Object.entries(ShowRepeatEnum).map(([key, value]) => ({
type: key as ShowRepeatEnum,
repeatName: value,
}));
enum WeekDaysEnum {
Monday = 0,
Tuesday = 1,
Wednesday = 2,
Thursday = 3,
Friday = 4,
Saturday = 5,
Sunday = 6,
Monday = 1,
Tuesday = 2,
Wednesday = 3,
Thursday = 4,
Friday = 5,
Saturday = 6,
Sunday = 0,
}
export interface WeekDays {

10
resources/js/composables/content/models/show/show.ts
View file

@ -1,6 +1,6 @@
import type {ShowInstance} from "@models/show/showInstance.ts";
import type {ShowDays} from "@models/show/showDays";
import type {ShowDjs} from "@models/show/showDjs";
import type {ShowDJs} from "@models/show/showDJs.ts";
import axios, {type AxiosResponse} from "axios";
import {cleanOptions} from "@/helpers/AxiosHelper.ts";
@ -18,13 +18,13 @@ export interface Show {
liveStreamPass?: string;
imagePath?: string | File;
hasAutoplaylist: boolean;
autoplaylist_id?: number;
autoplaylistId?: number;
autoplaylistRepeat: boolean;
// Relationships
block?: any;
showDays?: ShowDays;
showDjs?: ShowDjs[];
showDjs?: ShowDJs[];
showInstances?: ShowInstance[];
playlist?: any;
}
@ -32,7 +32,7 @@ export interface Show {
export const baseShow = (): Show => {
return {
id: null,
name: '',
name: 'Esempio',
url: '',
genre: '',
description: '',
@ -42,7 +42,7 @@ export const baseShow = (): Show => {
liveStreamPass: '',
imagePath: '',
hasAutoplaylist: false,
autoplaylist_id: 0,
autoplaylistId: null,
autoplaylistRepeat: false,
showDjs: null,
showDays: null,

6
resources/js/composables/content/models/show/showDjs.ts → resources/js/composables/content/models/show/showDJs.ts
View file

@ -1,6 +1,6 @@
import { VTextField } from "vuetify/components";
export interface ShowDjs {
export interface ShowDJs {
id?: number;
subjsId: number;
showId: number;
@ -11,7 +11,7 @@ export interface User {
login: string;
}
export function showDjsForm(item: ShowDjs) {
export function showDjsForm(item: ShowDJs) {
const visibleFields = {
subjsId: 'Presentatore',
showId: 'Programma'
@ -22,7 +22,7 @@ export function showDjsForm(item: ShowDjs) {
Object.keys(visibleFields).forEach((key) => {
fields[key] = {
label: visibleFields[key],
value: item[key as keyof ShowDjs],
value: item[key as keyof ShowDJs],
component: VTextField,
disabled: false
};

14
resources/js/composables/content/models/show/showDays.ts
View file

@ -1,6 +1,8 @@
import axios, {type AxiosResponse} from "axios";
import {cleanOptions} from "@/helpers/AxiosHelper.ts";
import {cleanOptions, snakeToCamel} from "@/helpers/AxiosHelper.ts";
import type {ShowRepetitionType} from "@models/show/ShowRepetition.ts";
//TODO RepeatType should use the interface ShowRepetitionType
export interface ShowDays {
id?: number;
firstShow: Date;
@ -9,7 +11,7 @@ export interface ShowDays {
timezone: string;
duration: string;
day: number[];
repeatType: number;
repeatType: string;
nextPopDate?: string;
showId?: number;
record?: number;
@ -22,8 +24,8 @@ export const baseShowDays = ():ShowDays => {
startTime: '08:00',
timezone: '',
duration: '01:00',
day: [0],
repeatType: 0,
day: [],
repeatType: 'noRepeat',
nextPopDate: '',
showId: 0,
record: 0
@ -31,14 +33,14 @@ export const baseShowDays = ():ShowDays => {
}
export const getShowDays = async (options: {
showId?: number | null;
show_id?: number | null;
flattenShowDays?: boolean;
}): Promise<ShowDays> => {
const filteredParams = cleanOptions(options);
return await axios.get(`/showDays`, {params: filteredParams})
.then((response: AxiosResponse) => {
return response.data
return snakeToCamel(response.data);
}).catch((error: Error) => {
console.log("Error: " + error);
})

28
resources/js/helpers/AxiosHelper.ts
View file

@ -2,4 +2,30 @@ export function cleanOptions(options: Object): Object {
return Object.fromEntries(
Object.entries(options).filter(([_, value]) => value !== undefined && value !== null)
);
}
}
export function camelToSnake(obj) {
if (Array.isArray(obj)) {
return obj.map(camelToSnake);
} else if (obj !== null && typeof obj === 'object') {
return Object.keys(obj).reduce((acc, key) => {
const snakeKey = key.replace(/([A-Z])/g, '_$1').toLowerCase();
acc[snakeKey] = camelToSnake(obj[key]);
return acc;
}, {});
}
return obj;
}
export function snakeToCamel(obj) {
if (Array.isArray(obj)) {
return obj.map(snakeToCamel);
} else if (obj !== null && typeof obj === 'object') {
return Object.keys(obj).reduce((acc, key) => {
const camelKey = key.replace(/_([a-z])/g, (_, char) => char.toUpperCase());
acc[camelKey] = snakeToCamel(obj[key]);
return acc;
}, {});
}
return obj;
}

22
resources/js/helpers/DateFormatter.ts
View file

@ -9,5 +9,23 @@ export function extractTime(dateTimeString: string, extractTime: boolean = false
const minutes = String(date.getMinutes()).padStart(2, '0');
return `${hours}:${minutes}`;
}
return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
};
return date.getFullYear() + '-' + String(date.getMonth() + 1).padStart(2, '0') + '-' + String(date.getDate()).padStart(2, '0');
};
export function getTimeDiff(startTime: Date, endTime: Date) {
const diffInMilliseconds = Math.abs(startTime.getTime() - endTime.getTime());
const hours = Math.floor((diffInMilliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
const minutes = Math.floor((diffInMilliseconds % (1000 * 60 * 60)) / (1000 * 60));
const formattedHours = String(hours).padStart(2, '0');
const formattedMinutes = String(minutes).padStart(2, '0');
return `${formattedHours}:${formattedMinutes}`;
}
export function getHoursMinutesFromString(timeString: string): Date {
const [ h, m ] = timeString.split(":");
const ms = new Date().setHours(h,m);
return new Date(ms)
}

54
resources/js/stores/show.store.ts
View file

@ -1,6 +1,9 @@
import { defineStore } from 'pinia'
import { type Show } from '@models/show/show'
import {defineStore} from 'pinia'
import {type Show} from '@models/show/show'
import type {ShowDays} from "@models/show/showDays";
import axios, {type AxiosResponse} from "axios";
import {camelToSnake} from "@/helpers/AxiosHelper.ts";
import {extractTime} from "@/helpers/DateFormatter.ts";
export const useShowStore = defineStore('show', {
state: () => ({
@ -9,23 +12,46 @@ export const useShowStore = defineStore('show', {
}),
actions: {
async loadShow(showData: Show) {
this.currentShow = { ...showData }
this.currentShow = {...showData}
},
updateField(payload: { key: string; value: any }) {
this.currentShow[payload.key] = payload.value
},
async saveShow() {
// Implement API call to save this.currentShow
},
async saveSchedule() {
// Implement schedule saving logic
},
resetShowDays() {
this.currentShow.showDays = { ...this.baseShowDays };
},
updateShowDaysField(payload: { key: string; value: any }) {
this.currentShow.showDays[payload.key] = payload.value;
}
},
async createShow() {
let showData = {...this.currentShow};
showData.showDays.firstShow = extractTime(showData.showDays.firstShow);
if (showData.showDays.lastShow) {
showData.showDays.lastShow = extractTime(showData.showDays.lastShow);
}
showData = camelToSnake(showData);
return await axios.post(`/show`, showData)
.then((response: AxiosResponse) => {
return response.data
}).catch((error: Error) => {
console.log("Error: " + error);
})
},
async updateShow() {
return await axios.post(`/show`, this.currentShow)
.then((response: AxiosResponse) => {
return response.data
}).catch((error: Error) => {
console.log("Error: " + error.message);
})
},
async updateShowDays() {
return await axios.post(`/showDays`, this.currentShow.showDays)
.then((response: AxiosResponse) => {
return response.data
}).catch((error: Error) => {
console.log("Error: " + error);
})
},
resetShowDays() {
this.currentShow.showDays = {...this.baseShowDays};
},
}
})

5
resources/js/stores/showInstance.store.ts
View file

@ -18,7 +18,10 @@ export const useShowInstanceStore = defineStore('showInstance', {
this.currentShowInstance = baseShowInstance()
},
async saveShowInstance() {
// Implement API call to save this.currentShowInstance
},
async updateShowInstance() {
},
}
})

2
routes/web.php
View file

@ -3,6 +3,7 @@
use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\FileController;
use App\Http\Controllers\Show\ShowController;
use App\Http\Controllers\Show\ShowDaysController;
use App\Http\Controllers\ShowInstance\ShowInstancesController;
use App\Http\Controllers\SmartBlockController;
use App\Http\Controllers\TrackTypeController;
@ -33,6 +34,7 @@ Route::resources([
'playlist' => PlaylistController::class,
'smartblock' => SmartBlockController::class,
'show' => ShowController::class,
'showDays' => ShowDaysController::class,
'showInstances' => ShowInstancesController::class,
'user' => UserController::class,
], [