Skip to content

Commit

Permalink
Merge pull request #14 from DaleMcGrew/Dale_WCC_Dec31-2024
Browse files Browse the repository at this point in the history
Added interface so HR team can set up onboarding tasks. Moved some svg icons to /img/global/svg-icons. Converted Header to functional component. pages/Tasks still is work in progress.
  • Loading branch information
DaleMcGrew authored Jan 5, 2025
2 parents 2eb33f8 + 2e1fa07 commit 4c63a52
Show file tree
Hide file tree
Showing 28 changed files with 1,638 additions and 148 deletions.
6 changes: 5 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const PageNotFound = React.lazy(() => import(/* webpackChunkName: 'PageNotFound'
const QuestionnaireAnswers = React.lazy(() => import(/* webpackChunkName: 'QuestionnaireAnswers' */ './js/pages/QuestionnaireAnswers'));
const QuestionnaireQuestionList = React.lazy(() => import(/* webpackChunkName: 'QuestionnaireQuestionList' */ './js/pages/SystemSettings/Questionnaire'));
const SystemSettings = React.lazy(() => import(/* webpackChunkName: 'SystemSettings' */ './js/pages/SystemSettings/SystemSettings'));
const TaskGroup = React.lazy(() => import(/* webpackChunkName: 'TaskGroup' */ './js/pages/SystemSettings/TaskGroup'));
const Tasks = React.lazy(() => import(/* webpackChunkName: 'Tasks' */ './js/pages/Tasks'));
const TeamMembers = React.lazy(() => import(/* webpackChunkName: 'TeamMembers' */ './js/pages/TeamHome'));
const Teams = React.lazy(() => import(/* webpackChunkName: 'Teams' */ './js/pages/Teams'));

Expand Down Expand Up @@ -284,9 +286,11 @@ class App extends Component {
<Route path="/q/:questionnaireId/:personId" exact component={AnswerQuestionsForm} />
<Route path="/questionnaire/:questionnaireId" exact component={QuestionnaireQuestionList} />
<Route path="/system-settings" exact component={SystemSettings} />
<Route path="/tasks" exact component={Tasks} />
<Route path="/task-group/:taskGroupId" exact component={TaskGroup} />
<Route path="/teams" exact component={Teams} />
<Route path="/team-home/:teamId" exact component={TeamMembers} />
<Route path="/" exact component={Teams} />
<Route path="/" exact component={Tasks} />

<Route path="*" component={PageNotFound} />
</Switch>
Expand Down
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions src/js/actions/TaskActions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import Dispatcher from '../common/dispatcher/Dispatcher';

export default {
taskDefinitionListRetrieve (taskGroupId, searchText = '') {
// console.log('TaskActions, taskDefinitionListRetrieve searchText:', searchText);
if (searchText) {
Dispatcher.loadEndpoint('task-definition-list-retrieve', {
taskGroupId,
searchText,
});
} else {
Dispatcher.loadEndpoint('task-definition-list-retrieve', {
taskGroupId,
});
}
},

taskDefinitionSave (taskGroupId = -1, taskDefinitionId = -1, incomingData = {}) {
// console.log('TaskActions, taskSave taskDefinitionId:', taskDefinitionId, ', incomingData:', incomingData);
const data = {
taskDefinitionId,
taskGroupId,
...incomingData,
};
Dispatcher.loadEndpoint('task-definition-save', data);
},

taskGroupListRetrieve (searchText = '') {
// console.log('TaskActions, taskGroupListRetrieve searchText:', searchText);
if (searchText) {
Dispatcher.loadEndpoint('task-group-list-retrieve', {
searchText,
});
} else {
Dispatcher.loadEndpoint('task-group-list-retrieve');
}
},

taskGroupRetrieve (taskGroupId = '') {
// console.log('TaskActions, taskGroupRetrieve taskGroupId:', taskGroupId);
if (taskGroupId) {
Dispatcher.loadEndpoint('task-group-retrieve', {
taskGroupId,
});
} else {
Dispatcher.loadEndpoint('task-group-retrieve');
}
},

taskGroupSave (taskGroupId = -1, incomingData = {}) {
// console.log('TaskActions, taskGroupSave taskGroupId:', taskGroupId, ', incomingData:', incomingData);
const data = {
taskGroupId,
...incomingData,
};
Dispatcher.loadEndpoint('task-group-save', data);
},

taskSave (taskGroupId = -1, taskDefinitionId = -1, incomingData = {}) {
// console.log('TaskActions, taskSave taskDefinitionId:', taskDefinitionId, ', incomingData:', incomingData);
const data = {
taskDefinitionId,
taskGroupId,
...incomingData,
};
Dispatcher.loadEndpoint('task-save', data);
},
};
Loading

0 comments on commit 4c63a52

Please sign in to comment.