Merge branch 'main' of https://git.d-popov.com/popov/mwitnessing

_scripts/fix_NovaSmqna.sql

@@ -16,4 +16,26 @@ SET name = CONCAT(
     ' - ',
     TIME_FORMAT(DATE_ADD(endTime, INTERVAL 3 HOUR), '%H:%i')
 )
-WHERE name = 'Нова смяна';
+WHERE name = 'Нова смяна';
+
+-- или кратки
+
+UPDATE Shift 
+SET name = CONCAT(
+    CASE DAYOFWEEK(startTime)
+        WHEN 1 THEN 'Нед.'
+        WHEN 2 THEN 'Пон.'
+        WHEN 3 THEN 'Вт.'
+        WHEN 4 THEN 'Ср.'
+        WHEN 5 THEN 'Четв.'
+        WHEN 6 THEN 'Пет.'
+        WHEN 7 THEN 'Съб.'
+    END,
+    ' ',
+    DAY(startTime),
+    ', ',
+    TIME_FORMAT(DATE_ADD(startTime, INTERVAL 3 HOUR), '%H:%i'),
+    ' - ',
+    TIME_FORMAT(DATE_ADD(endTime, INTERVAL 3 HOUR), '%H:%i')
+)
+WHERE name = 'Нова смяна'

components/publisher/PublisherForm.js

@@ -166,7 +166,7 @@ export default function PublisherForm({ item, me }) {
             <div className="mb-4">
               <label className="label" htmlFor="lastName">Фамилия</label>
               <input type="text" id="lastName" name="lastName" value={publisher.lastName} onChange={handleChange} className="textbox" placeholder="Last Name" autoFocus />
-              <ProtectedRoute allowedRoles={[UserRole.ADMIN]} deniedMessage=" ">
+              <ProtectedRoute allowedRoles={[UserRole.ADMIN, UserRole.POWERUSER]} deniedMessage=" ">
 
                 <div className="border border-blue-500 border-solid p-2">
                   <div className="form-check">
@@ -183,7 +183,7 @@ export default function PublisherForm({ item, me }) {
               <input type="number" id="desiredShiftsPerMonth" name="desiredShiftsPerMonth" value={publisher.desiredShiftsPerMonth} onChange={handleChange} className="textbox" placeholder="desiredShiftsPerMonth" autoFocus />
             </div>  <div className="mb-4">
               <label className="label" htmlFor="email">Имейл</label>
-              <ProtectedRoute allowedRoles={[UserRole.ADMIN]} deniedMessage={publisher.email} className="">
+              <ProtectedRoute allowedRoles={[UserRole.ADMIN, UserRole.POWERUSER]} deniedMessage={publisher.email} className="">
                 <div className="border border-blue-500 border-solid p-2">
                   <input type="text" id="email" name="email" value={publisher.email} onChange={handleChange} className="textbox" placeholder="Email" autoFocus />
                 </div>