Browse Source

Modfied some methods

pull/44/head
Safet Purkovic 3 years ago
parent
commit
666ae0ff2d

+ 9
- 2
src/components/Selection/Selection.js View File

@@ -1,6 +1,7 @@
import React from "react";
import PropTypes from "prop-types";
import { selectDoneProcessError } from "../../store/selectors/processSelectors";
import { selectAuthUser} from "../../store/selectors/userSelectors"
import { setDoneProcessReq } from "../../store/actions/processes/processAction";
import { useDispatch, useSelector } from "react-redux";
import { formatDateSrb, formatTimeSrb } from "../../util/helpers/dateHelpers";
@@ -18,13 +19,19 @@ const Selection = (props) => {
const applicants = props.selection.selectionProcesses;
const errorMessage = useSelector(selectDoneProcessError);
const dispatch = useDispatch();
const user = useSelector(selectAuthUser);


const dropItem = (e, selId) => {
var data = e.dataTransfer.getData("text/plain");
const selectionProcess = JSON.parse(data);
if (selectionProcess.selectionLevelId !== selId) {
dispatch(setDoneProcessReq({ id: selectionProcess.id }));
dispatch(setDoneProcessReq({
id: selectionProcess.id,
name: "radnom name",
applicantId: selectionProcess.applicant.applicantId,
schedulerId: user.id
}));
}
if (errorMessage) {
console.log(errorMessage)
@@ -42,7 +49,7 @@ const Selection = (props) => {
<button>{item.status}</button>
</div>
<div className="date">
<p>{formatDateSrb(item.date)} <span className="grey">|</span> {formatTimeSrb(item.date)}</p>
{item.date !== null && item.date !== "" && <p>{formatDateSrb(item.date)} <span className="grey">|</span> {formatTimeSrb(item.date)}</p>}
</div>
<div className="full-name">
<p>{item.applicant.firstName + " " + item.applicant.lastName}</p>

+ 1
- 1
src/pages/SelectionProcessPage/SelectionProcessOfApplicantPage.js View File

@@ -154,7 +154,7 @@ const SelectionProcessOfApplicantPage = () => {
return <ApplicantSelection
levelNumber={index + 1}
levelName={process.selectionLevel.name}
schedguler={"SAfet Purkovic"}
schedguler={`${process?.scheduler?.firstName} ${process?.scheduler?.lastName}`}
link={process.link}
date={new Date(process.date)}
status={process.status}

+ 2
- 2
src/request/processesReguest.js View File

@@ -1,6 +1,6 @@
import { getRequest } from ".";
import { getRequest, postRequest } from ".";
import apiEndpoints from "./apiEndpoints";

export const getAllLevels = () => getRequest(apiEndpoints.processes.allLevels);
export const doneProcess = (id) => getRequest(`${apiEndpoints.processes.doneProcess}/${id}`);
export const doneProcess = (data) => postRequest(apiEndpoints.processes.doneProcess,data);
export const getProcessesOfApplicant = (id) => getRequest(`${apiEndpoints.processes.getApplicantProcesses}/${id}`);

+ 2
- 2
src/store/saga/processSaga.js View File

@@ -16,8 +16,8 @@ export function* getProcesses() {

export function* finishProcess(payload) {
try {
const id = payload.payload.id;
const result = yield call(doneProcess,id);
const model = payload.payload;
const result = yield call(doneProcess,model);
yield put(setDoneProcess(result.data));
} catch (error) {
yield put(setDoneProcessError(error));

+ 1
- 1
src/util/helpers/dateHelpers.js View File

@@ -46,5 +46,5 @@ export function formatDateSrb(date) {

export function formatTimeSrb(date) {
const dt = new Date(date);
return format(dt, 'HH.mm.');
return format(dt, 'HH:mm');
}

Loading…
Cancel
Save