Merge branch 'MergeProblem1' of http://svn.2fi-solutions.com:8300/derek/FPSMS-frontend into MergeProblem1

src/components/DashboardPage/truckSchedule/TruckScheduleDashboard.tsx

@@ -499,9 +499,9 @@ const TruckScheduleDashboard: React.FC = () => {
                     <TableCell sx={{ fontWeight: 600 }}>{t("Truck Schedule")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }}>{t("Time Remaining")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }} align="center">{t("No. of Shops")}</TableCell>
-                    <TableCell sx={{ fontWeight: 600 }} align="center">{t("Total Items")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }} align="center">{t("Tickets Released")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }} align="center">{t("Tickets Completed")}</TableCell>
+                    <TableCell sx={{ fontWeight: 600 }} align="center">{t("Total Items")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }}>{t("First Ticket Start")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }}>{t("Last Ticket End")}</TableCell>
                     <TableCell sx={{ fontWeight: 600 }} align="center">{t("Pick Time (min)")}</TableCell>
@@ -561,11 +561,6 @@ const TruckScheduleDashboard: React.FC = () => {
                               {row.numberOfShopsToServe} [{row.numberOfPickTickets}]
                             </Typography>
                           </TableCell>
-                          <TableCell align="center">
-                            <Typography variant="body2" sx={{ fontWeight: 500 }}>
-                              {row.totalItemsToPick}
-                            </Typography>
-                          </TableCell>
                           <TableCell align="center">
                             <Chip 
                               label={row.numberOfTicketsReleased}
@@ -580,6 +575,11 @@ const TruckScheduleDashboard: React.FC = () => {
                               color={row.numberOfTicketsCompleted > 0 ? 'success' : 'default'}
                             />
                           </TableCell>
+                          <TableCell align="center">
+                            <Typography variant="body2" sx={{ fontWeight: 500 }}>
+                              {row.totalItemsToPick}
+                            </Typography>
+                          </TableCell>
                           <TableCell>
                             {formatDateTime(row.firstTicketStartTime)}
                           </TableCell>