popov/mwitnessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui fixes

Browse Source
This commit is contained in:
Dobromir Popov
2024-05-28 16:42:24 +03:00
parent 3e6d898f78
commit 9ad77bec38
2 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/calendar/ShiftComponent.tsx
View File

@ -151,27 +151,24 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
let borderStyles = ''; let borderStyles = '';
let canTransport = false; let canTransport = false;
if (selectedPublisher && selectedPublisher.id === ass.publisher.id) { if (selectedPublisher && selectedPublisher.id === ass.publisher.id) {
borderStyles += 'border-2 border-blue-300'; // Bottom border for selected publishers borderStyles += 'bg-blue-200 font-bold '; // Bottom border for selected publishers
} }
else {
if (publisherInfo.availabilityCount == 0) //user has never the form if (publisherInfo.availabilityCount == 0 || !publisherInfo.availabilities || publisherInfo.availabilities.length == 0)
//user has never the filled the avalabilities form or if there is no publisherInfo - draw red border - publisher is no longer available for the day!
{ {
borderStyles = 'border-2 border-orange-300 '; borderStyles += 'border-2 border-red-500 ';
} } else {
else
//if there is no publisherInfo - draw red border - publisher is no longer available for the day!
if (!publisherInfo.availabilities || publisherInfo.availabilities.length == 0) {
borderStyles = 'border-2 border-red-500 ';
}
else {
// checkig if the publisher is available for this assignment // checkig if the publisher is available for this assignment
//ToDo: verify if that check is correct
const av = publisherInfo.availabilities?.find(av => const av = publisherInfo.availabilities?.find(av =>
av.startTime <= shift.startTime && av.endTime >= shift.endTime av.startTime <= shift.startTime && av.endTime >= shift.endTime
); );
if (av) { if (av) {
borderStyles += 'border-l-2 border-blue-500 '; // Left border for specific availability conditions borderStyles += 'border-b-2 border-blue-500 '; // Left border for specific availability conditions
ass.canTransport = av.isWithTransportIn || av.isWithTransportOut; ass.canTransport = av.isWithTransportIn || av.isWithTransportOut;
// console.log(publisherInfo.firstName, "available for shift", shift.id, "at", common.getDateFormattedShort(new Date(shift.startTime)), "av-" + av.id, ": a." + common.getTimeFormatted(av.startTime), "<=", common.getTimeFormatted(shift.startTime), "; a." + common.getTimeFormatted(av.endTime), ">=", common.getTimeFormatted(shift.endTime));
} }
else { else {
borderStyles += 'border-l-4 border-red-500 '; borderStyles += 'border-l-4 border-red-500 ';
@ -192,7 +189,6 @@ function ShiftComponent({ shift, onShiftSelect, isSelected, onPublisherSelect, a
} }
}
return ( return (
<div key={index} <div key={index}

4
pages/dash.tsx
View File

@ -31,7 +31,7 @@ export default function DashboardPage({ initialItems, initialUserId, cartEvents,
const router = useRouter(); const router = useRouter();
const { newLogin } = router.query; const { newLogin } = router.query;
const { data: session } = useSession(); const { data: session } = useSession();
const [userName, setUserName] = useState(session?.user?.name); const [userName, setUserName] = useState('');
const [userId, setUserId] = useState(initialUserId); const [userId, setUserId] = useState(initialUserId);
const [events, setEvents] = useState(initialItems?.map(item => ({ const [events, setEvents] = useState(initialItems?.map(item => ({
...item, ...item,
@ -43,7 +43,7 @@ export default function DashboardPage({ initialItems, initialUserId, cartEvents,
}))); })));
useEffect(() => { useEffect(() => {
if (session) { if (session && userName === '' && session.user.name) {
setUserName(session.user.name); setUserName(session.user.name);
setUserId(session.user.id); setUserId(session.user.id);
//handleUserSelection({ id: session.user.id, firstName: session.user.name, lastName: '' }); //handleUserSelection({ id: session.user.id, firstName: session.user.name, lastName: '' });