+
+
+ Date
+ Start
+ End
+ Work Time
+ 11h Rest
+ Break duration
+ Break after >6h
+ <=10h
+ Time overlap
+ Work Sunday
+ Work Day Off
+
+
+
+ {displayData()}
+
+
Explanations:
+
+
11h Rest - You must rest at least for 11h from one day to another.
+
Break Duration - You must pause at least 30 minutes when working more than 6h and 45 minutes when working more than 9 hours.
+
Break after >6h - You must not work more than 6h at a time - there must be a break in between.
+
<=10h - You must not work more than 10 hours per day
+
Time overlap - You have entered times that overlap (see Entry Overview)
+
Work Sunday - You must not work on Sunday
+
Work Day Off - You must not work on Holiday or Vacation
)
- }))
- }
-
- // When there had been an Excel Error, print information
- if (excelDataStatus === 'succeeded' && (excelData.length === 0 || excelValidationError.length !== 0)){
- return(
-
-
ISSUE WITH EXCEL FILE:
-
Please make sure that first tab in Excel contains the Timesheet data.
-
The column titles must be available in the first row.
-
Please check also the column title names are as pre-specified - additional columns are supported, order does not matter.
- {printHints(excelValidationError)}
-
- )
- }
-
- // If busy, process first and doe not return anything (reading information first)
- if (excelDataStatus !== 'succeeded' || kimaiSubmittedTimesheets.length === 0 || !excelSelectedWeek ||
- kimaiDataStatus !== 'succeeded' ||
- (kimaiTimesheetsStatus !== 'succeeded' &&
- kimaiSubmittedStatus === 'idle')) {
- return null;
- }
-
- // Excel: select CALENDERWEEK - get ID numbers for user, project and activity
- var excelDisplayData = [...excelData.filter(item => item.week.week === excelSelectedWeek)];
- excelDisplayData = excelDisplayData.map((item) => {
- var description = [item.tasks, item.details].filter(Boolean).join(" - ");
- var activityId = null;
- if (item.activity){
- activityId = getIdFromKimaiData(kimaiData,item.customer, item.project, item.activity);
- if (!activityId){
- activityId = getIdFromKimaiData(kimaiData, null, null, item.activity);
- }
- }
-
- return ({
- ...item,
- userId: kimaiData.userId,
- projectId: getIdFromKimaiData(kimaiData,item.customer, item.project, null),
- activityId: activityId,
- description: description,
- billable: item.chargeableCorrected !== undefined ? item.chargeableCorrected : item.chargeable,
- timesheetId: null
- }
- );
- });
-
- // Kimai: select data of corresponding calenderweek
- const startDay = excelDisplayData[0].week.weekStartDay;
- const endDay = excelDisplayData[0].week.weekEndDay;
- var kimaiDisplayData = kimaiTimesheets.filter(item => item.begin.split('T')[0] >= startDay && item.end?.split('T')[0] <= endDay);
-
- // loop through DB data and update Sheet link if available, otherwise include into display data
- kimaiDisplayData.forEach(item => {
- const entry = {
- timesheetId: item.id,
- date: item.begin.split('T')[0],
- start: item.begin.substring(11, 16),
- end: item.end.substring(11, 16),
- project: kimaiData.projects[item.project].name,
- projectId: item.project,
- customer: kimaiData.projects[item.project].customer.name || "ERROR - invalid customer",
- customerId: kimaiData.projects[item.project]?.customer.id || "ERROR - invalid project",
- activity: kimaiData.activities[item.activity]?.name || "ERROR - invalid activity",
- activityId: item.activity,
- description: item.description ? item.description : "",
- billable: item.billable
- };
-
- // check whether entry is available
- var found = false;
- excelDisplayData.forEach(excelItem => {
- if (!excelItem.timesheetId &&
- excelItem.date === entry.date &&
- excelItem.start === entry.start &&
- excelItem.end === entry.end &&
- excelItem.project === entry.project &&
- excelItem.activity === entry.activity &&
- excelItem.description === entry.description &&
- excelItem.billable === entry.billable
- ) {
- excelItem.timesheetId = entry.timesheetId;
- found = true;
- }
- })
- if (!found) {
- excelDisplayData.push(entry);
- }
- })
-
- // included previously deleted entries
- if (deletedTimesheets?.length > 0) {
- const deletedIDs = deletedTimesheets.map(item => item.timesheetId);
- excelDisplayData = excelDisplayData.filter(item => !deletedIDs.includes(item.timesheetId)).concat(deletedTimesheets);
- }
-
- // supporter function to include error message text
- const includeError = (item, message) => {
- item.action = "error";
- if (!item.message) {
- item.message = []
- item.message.push(message);
- }
- else {
- item.message.push(message);
- }
- }
-
- // loop through excel data and investigate action
- excelDisplayData.forEach(item => {
- if (!item.action) {
- // set actions and
- if (config.ignoreActivities && config.ignoreActivities.includes(item.activity)) {
- item.action = "ignore";
- item.message = ["Activity '" + item.activity + "' is always ignored by configuration."];
- }
- else if (item.lineNumber && item.timesheetId) {
- item.action = "none";
- }
- else if (item.lineNumber && !item.timesheetId) {
- // available in Excel, but not in Kimai
- item.action = (!kimaiSubmittedTimesheets[item.lineNumber]) ? "add" : "added";
- }
- else if (!item.lineNumber && item.timesheetId) {
- // available in Kimai, but not in Excel
- item.action = "delete";
- item.message = ["This item is available in Kimai, but not in the ExcelSheet. It will be deleted from Kimai."];
- }
-
- // perform checks on Excel content, update messages
- if (item.lineNumber && item.action === "add") {
- if (!item.activityId) {
- includeError(item, "Activitiy not found in Kimai.");
- }
- if (!item.projectId) {
- includeError(item, "Project not found in Kimai.");
- }
- if (!item.start) {
- includeError(item, "Start time must not be missing.");
- }
- if (!item.end) {
- includeError(item, "End time must not be missing.");
+ const [isModificationAvailable, setIsModificationAvailable] = useState(false);
+
+ useEffect(() => {
+ // Following actions are available: ignore, none, add, added, delete, deleted, error
+ // To allow for "Submit for approval", action must not contain any add, delete or error actions
+ const isNoModificationAvailable = excelDisplayData.filter(
+ (item) =>
+ item.action === 'add' ||
+ item.action === 'delete' ||
+ item.action === 'error'
+ ).length === 0;
+ setIsModificationAvailable(!isNoModificationAvailable)
+ if (canBeSubmittedForApprovalStore[excelSelectedWeek.weekStartDay] !== isNoModificationAvailable &&
+ approvalData[excelSelectedWeek.weekStartDay] === 'Not submitted'){
+ if (addedIssues !== true) {
+ dispatch(updateExcelWeekStatus({ weekStartDay: excelSelectedWeek.weekStartDay, status: isNoModificationAvailable }))
}
- }
}
- });
+ }, [excelDisplayData, excelSelectedWeek.weekStartDay, dispatch, canBeSubmittedForApprovalStore, approvalData, addedIssues]);
- // check whether there are time overlay conflicts
- checkExcelTimeOverlays(excelDisplayData);
// investigate hours
var hours = investigateHours(excelDisplayData);
@@ -269,8 +128,9 @@ export const WeekDataDisplay = ({ dispatch }) => {
overlayColorCode = "orange";
}
- const negativeProject = !kimaiData.projects[item.projectId] && item.action !== "ignore" ? true : false;
- const negativeActivity = !kimaiData.activities[item.activityId] && item.action !== "ignore" ? true : false;
+ const negativeCustomer = !item.customerId && item.action !== "ignore" ? true : false;
+ const negativeProject = !item.projectId && item.action !== "ignore" ? true : false;
+ const negativeActivity = !item.activityId && item.action !== "ignore" ? true : false;
const negativeStart = !item.start && item.action !== "ignore" ? true : false;
const negativeEnd = !item.end && item.action !== "ignore" ? true : false;
@@ -283,7 +143,7 @@ export const WeekDataDisplay = ({ dispatch }) => {
{item.date}{item.start}{item.end}
- {item.customer}
+ {item.customer}{item.project}{item.activity}{item.description}
@@ -298,22 +158,19 @@ export const WeekDataDisplay = ({ dispatch }) => {
);
}
+ const updateTimesheetInformation = () => {
+ dispatch(fetchAllTimesheets({ ...config, userId: userId }))
+ dispatch(loadOvertimeWeek({week:excelSelectedWeek, config:config}))
+ }
+
// perform update actions and afterwards trigger re-read from Kimai
const performSendToKimaiClick = () => {
setDisplayConfirmDeleteInKimai(false);
- // add new timeSheets to Kimai
- var submitExcelData = excelDisplayData.filter(item => item.action === "add");
- dispatch(pushAllTimesheets({ data: submitExcelData, config: config }));
-
// remove timeSheets in Kimai
- var removeAccordingExcelData = excelDisplayData.filter(item => item.action === "delete");
- dispatch(deleteTimesheets({ data: removeAccordingExcelData, config: config }));
-
- // update information - fetch from database
- setTimeout(function () {
- dispatch(fetchAllTimesheets({ ...config, userId: userId }))
- }, 5000);
+ const removeAccordingExcelData = excelDisplayData.filter(item => item.action === "delete");
+ const submitExcelData = excelDisplayData.filter(item => item.action === "add");
+ dispatch(processTimesheets({ addData: submitExcelData, deleteData: removeAccordingExcelData, config: config, callback: updateTimesheetInformation}))
}
const abortSendToKimaiClick = () => {
@@ -336,24 +193,62 @@ export const WeekDataDisplay = ({ dispatch }) => {
return times.hours.toString() + ":" + mins;
}
+ const renderOvertime = () => {
+ if (config.overtime === false){
+ return null;
+ }
+ var returnText = "";
+ if (!overtimeStatus[excelSelectedWeek.weekStartDay]){
+ return null;
+ }
+ if (approvalData[excelSelectedWeek.weekStartDay] !== 'Not submitted'){
+ returnText = "Overtime end of week: " + overtimeStatus[excelSelectedWeek.weekStartDay].overtimeFormatted;
+ } else {
+ returnText = "Overtime end of week (Kimai entries): " + overtimeStatus[excelSelectedWeek.weekStartDay].overtimeFormatted;
+ }
+ return (
+
+ {approvalData[excelSelectedWeek.weekStartDay] !== 'Not submitted' &&
+ approvalData[excelSelectedWeek.weekStartDay] !== undefined &&
+ config.approval !== false &&
+ isModificationAvailable === true &&
+
+
+
+ ERROR: There are discrepancies between submitted hours and the hours of your Excel file!
+ Please correct your Excel file or ask your teamlead to cancel the approval workflow to update your hours!
+
+
+
+ }
+ />
+ )
}
-
-const mapStateToProps = state => {
-
- return {
- messages: state.messages,
- config: state.config,
- kimaiGeneralStatusError: state.kimaiData.error
- };
-};
-
-export default connect(
- mapStateToProps,
- null
-)(Admin);
-
-//export default Admin;
\ No newline at end of file
+export default Admin;
\ No newline at end of file
diff --git a/src/features/views/Info.js b/src/features/views/Info.js
index e952261..d3f710b 100644
--- a/src/features/views/Info.js
+++ b/src/features/views/Info.js
@@ -1,56 +1,66 @@
import React from 'react';
import HeaderTop from '../../components/HeaderTop';
import { Grid, Segment, Icon } from 'semantic-ui-react';
+import { useSelector } from 'react-redux'
+import { Redirect } from 'react-router-dom'
import 'semantic-ui-css/semantic.min.css'
import '../../css/globals.css';
-class Info extends React.Component {
+function Info (props) {
+ const config = useSelector((state) => state.config);
+ const kimaiGeneralStatusError = useSelector((state) => state.kimaiData.error);
- render() {
- return (
-
-
-
-
-
-
-
-
Information
-
TimeKex - Timetracking, Kimai meets Excel
-
This WebApplication is designed to allow the tracking of working hours in Excel which can then be uploaded to the Kimai Timetracking application.
-
Kimai
- is an open-source free time-tracking application which comes with a lot of functionality and capabilities. There might be
- situations where the times should be tracked in Excel and finally be uploaded to Kimai. TimeKex is designed to support this process.
-
- Prerequisites:
-
To be able to run TimeKex, a running instance of Kimai is required together with a user and an API key of this user.
- The API password can be set in Kimai via "profile", "API" and then "API Password".
- There is a stable demonstration version available for Kimai which
- can be used for demonstration purposes (linked here).
- To checkout demo users and specifically the API password of a demo user, check the demo information page.
-
Please check the package.json for detailed information which packages are used. Addional
- a third party license file is included in the
- repository to show which third-party-software might be used by this project.
-
This WebApplication is designed to allow the tracking of working hours in Excel which can then be uploaded to the Kimai Timetracking application.
+
Kimai
+ is an open-source free time-tracking application which comes with a lot of functionality and capabilities. There might be
+ situations where the times should be tracked in Excel and finally be uploaded to Kimai. TimeKex is designed to support this process.
+
+ Prerequisites:
+
To be able to run TimeKex, a running instance of Kimai is required together with a user and an API key of this user.
+ The API password can be set in Kimai via "profile", "API" and then "API Password".
+ There is a stable demonstration version available for Kimai which
+ can be used for demonstration purposes (linked here).
+ To checkout demo users and specifically the API password of a demo user, check the demo information page.
+
Please check the package.json for detailed information which packages are used. Addional
+ a third party license file is included in the
+ repository to show which third-party-software might be used by this project.
+
-