This commit is contained in:
Dobromir Popov
2024-02-29 11:05:24 +02:00
parent cbe1d7e695
commit 9bb4f7a568
4 changed files with 46 additions and 20 deletions

View File

@ -165,4 +165,25 @@ fix availability repeat checks
-- --
- да оправя дневните разположения - да оправя дневните разположения
- да се взимат в предвид повтарящите се разопложения - да се взимат в предвид повтарящите се разопложения
--------------------------------------------------------------------
График - само седмица
Администратор
вестители - всички - мъж
-- форма за обратна връзка
-- моя график
-- add publish functionality to shifts
# caendar/admin
fix the problem where availability info is not present on calendar - can't destinguish between no availability(not active/imported) and changed availability
second add/delete fails
# my calenda
sometimes delete from mycalendar fails
saturday shifts start at 12:00 / dymamic

View File

@ -85,6 +85,8 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
// if (onPublisherSelect) { // if (onPublisherSelect) {
// onPublisherSelect(publisher); // onPublisherSelect(publisher);
// } // }
common.copyToClipboard(null, publisher.firstName + ' ' + publisher.lastName);
} }
const removeAssignment = async (id) => { const removeAssignment = async (id) => {
@ -124,6 +126,8 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
return ( return (
<div className={`flow w-full p-4 py-2 border-2 border-gray-300 rounded-md my-1 ${isSelected ? 'bg-gray-200' : ''}`} <div className={`flow w-full p-4 py-2 border-2 border-gray-300 rounded-md my-1 ${isSelected ? 'bg-gray-200' : ''}`}
onClick={handleShiftClick} onDoubleClick={copyAllPublisherNames}> onClick={handleShiftClick} onDoubleClick={copyAllPublisherNames}>

View File

@ -108,28 +108,28 @@ export default function FeedbackForm({ publisherId, onDone }) {
<div className="w-full max-w-md mx-auto"> <div className="w-full max-w-md mx-auto">
<form className="bg-white dark:bg-gray-800 shadow rounded-lg px-8 pt-6 pb-8 mb-4" onSubmit={handleSubmit} > <form className="bg-white dark:bg-gray-800 shadow rounded-lg px-8 pt-6 pb-8 mb-4" onSubmit={handleSubmit} >
<h1 className="text-2xl font-bold mb-4">Отзив</h1> <h1 className="text-2xl font-bold mb-4">Намерих технически проблем:</h1>
<div className="mb-4"> <div className="mb-4">
<label className='block text-gray-700 dark:text-gray-300 text-sm font-bold mb-2' htmlFor="location">Тип</label> <label className='block text-gray-700 dark:text-gray-300 text-sm font-bold mb-2' htmlFor="location">Тип</label>
{locations && (
<select <select
name="placementCount" name="placementCount"
id="placementCount" id="placementCount"
value={item.placementCount} value={item.placementCount}
onChange={(e) => { onChange={(e) => {
setItem(prevItem => ({ setItem(prevItem => ({
...prevItem, ...prevItem,
placementCount: parseInt(e.target.value) placementCount: parseInt(e.target.value)
})); }));
}} }}
className="block appearance-none w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded py-2 px-3 text-gray-700 dark:text-gray-300 leading-tight focus:outline-none focus:bg-white focus:border-blue-500" className="block appearance-none w-full bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded py-2 px-3 text-gray-700 dark:text-gray-300 leading-tight focus:outline-none focus:bg-white focus:border-blue-500"
> >
<option key={1} value={1}>Намерих проблем</option> <option key={1} value={1}>Намерих проблем</option>
<option key={2} value={2}>Предложение</option> <option key={2} value={2}>Предложение</option>
<option key={3} value={3}>Друго</option> <option key={3} value={3}>Друго</option>
</select> </select>
)}
</div> </div>
<div className="mb-8"> {/* Increased bottom margin */} <div className="mb-8"> {/* Increased bottom margin */}

View File

@ -106,6 +106,7 @@ model Publisher {
familyHeadId String? // Optional familyHeadId for each family member familyHeadId String? // Optional familyHeadId for each family member
familyHead Publisher? @relation("FamilyMember", fields: [familyHeadId], references: [id]) familyHead Publisher? @relation("FamilyMember", fields: [familyHeadId], references: [id])
familyMembers Publisher[] @relation("FamilyMember") familyMembers Publisher[] @relation("FamilyMember")
//alwaysAsFamily Boolean? @default(false) // New field to indicate if the publisher always wants to be assigned with the family
type PublisherType @default(Publisher) type PublisherType @default(Publisher)
town String? town String?
comments String? comments String?