apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove last

Browse Source
This commit is contained in:
Victor Batischev 2024-02-28 19:59:56 +03:00
parent 57cc2bc1fa
commit 59d0f5eae6
11 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
View File

@ -6,7 +6,7 @@ import {
modalToggle
} from "@redux/projectsTrackerSlice";
import { caseOfNum, urlForLocal } from "@utils/helper";
import { caseOfNum, removeLast, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
@ -67,7 +67,7 @@ const ListEmployees = ({
}
alt="avatar"
/>
<span>{person.user.fio.split(" ").slice(0, -1).join(" ")}</span>
<span>{removeLast(person.user.fio)}</span>
<img
className="delete"
src={close}

12
src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
View File

@ -11,10 +11,10 @@ import { getProfileInfo } from "@redux/outstaffingSlice";
import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";
import {
backendImg,
caseOfNum,
getCorrectRequestDate,
getToken,
removeLast,
urlForLocal
} from "@utils/helper";
@ -759,12 +759,12 @@ export const ModalTiсket = ({
<div className="workers_box task__info">
<span className="exit" onClick={() => setActive(false)}></span>
<h5>Создатель: </h5>
<p className="workers__creator">{task.user?.fio}</p>
<p className="workers__creator">{removeLast(task.user?.fio)}</p>
{executor ? (
<>
<h5>Исполнитель: </h5>
<div className="executor">
<p>{executor.fio}</p>
<p>{removeLast(executor.fio)}</p>
<img
src={
executor?.avatar
@ -803,7 +803,7 @@ export const ModalTiсket = ({
key={person.user_id}
onClick={() => taskExecutor(person)}
>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
<img
src={
person.user?.avatar
@ -826,7 +826,7 @@ export const ModalTiсket = ({
{members.map((member) => {
return (
<div className="worker" key={member.user_id}>
<p>{member.fio.split(" ").slice(0, -1).join(" ")}</p>
<p>{removeLast(member.fio)}</p>
<img
src={
member?.avatar
@ -869,7 +869,7 @@ export const ModalTiсket = ({
key={person.user_id}
onClick={() => addMember(person)}
>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
<img
src={
person.user?.avatar

8
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -23,7 +23,7 @@ import {
} from "@redux/projectsTrackerSlice";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectRequestDate, urlForLocal } from "@utils/helper";
import { getCorrectRequestDate, removeLast, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
@ -448,7 +448,7 @@ export const TrackerModal = ({
>
<p>
{selectedWorker
? selectedWorker.employee.fio
? removeLast(selectedWorker.employee.fio)
: "Выберите пользователя"}
</p>
<img className="arrow" src={arrowDown} alt="arrow" />
@ -467,7 +467,7 @@ export const TrackerModal = ({
setSelectedWorker(worker);
}}
>
<span>{worker.employee.fio}</span>
<span>{removeLast(worker.employee.fio)}</span>
<img
src={urlForLocal(worker.employee.avatar)}
alt="avatar"
@ -698,7 +698,7 @@ export const TrackerModal = ({
}
alt="avatar"
/>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
</div>
);
})

2
src/components/Modal/Tracker/TrackerModal/trackerModal.scss
View File

@ -262,7 +262,7 @@
position: absolute;
width: 100%;
padding: 9.5px 12px;
top: 48px;
top: 45px;
left: 0;
background: white;
border-radius: 5px;

2
src/components/Navigation/Navigation.jsx
View File

@ -97,7 +97,7 @@ export const Navigation = () => {
<div className="profile-header__personal-info">
<h3 className="profile-header__personal-info-name">
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
{profileInfo?.fio || profileInfo?.username}
</h3>
<NavLink end to={"/profile"}>
<img

2
src/components/ProfileCalendar/ProfileCalendar.jsx
View File

@ -95,7 +95,7 @@ export const ProfileCalendar = () => {
alt="avatar"
/>
<p className="summary__name">
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
{profileInfo?.fio || profileInfo?.username},{" "}
{profileInfo.specification} разработчик
</p>
</div>

2
src/components/ProfileHeader/ProfileHeader.jsx
View File

@ -146,7 +146,7 @@ export const ProfileHeader = () => {
<nav className="auth-body__navigation">
<div className="profile-header__personal-info">
<h3 className="profile-header__personal-info-name">
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
{profileInfo?.fio || profileInfo?.username}
</h3>
<NavLink end to={"/profile"}>
<img

10
src/pages/Profile/Profile.jsx
View File

@ -103,12 +103,12 @@ export const Profile = () => {
{user === "developer" ? (
<span>
<p>Добрый день,&nbsp;</p>
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
{profileInfo?.fio || profileInfo?.username}
</span>
) : (
<span>
<p>Добрый день,&nbsp;</p>
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
{profileInfo?.fio || profileInfo?.username}
</span>
)}
</h2>
@ -124,13 +124,11 @@ export const Profile = () => {
<p className="summary__name">
{user === "developer" ? (
<span>
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
{profileInfo?.fio || profileInfo?.username},{" "}
{profileInfo?.specification} разработчик
</span>
) : (
<span>
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}
</span>
<span>{profileInfo?.fio || profileInfo?.username}</span>
)}
</p>
</div>

2
src/pages/ProjectTracker/ProjectTracker.jsx
View File

@ -967,7 +967,7 @@ export const ProjectTracker = () => {
alt="avatar"
/>
<span>
{task.executor?.fio ||
{removeLast(task.executor?.fio) ||
"Исполнитель не назначен"}
</span>
</div>

2
src/pages/Summary/Summary.jsx
View File

@ -107,7 +107,7 @@ export const Summary = () => {
alt="avatar"
/>
<p className="summary__name">
{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username},{" "}
{profileInfo?.fio || profileInfo?.username},{" "}
{profileInfo.specification} разработчик
</p>
</div>

9
src/utils/helper.js
View File

@ -92,7 +92,10 @@ export function copyProjectLink(projectId) {
);
}
export function removeLast(string) {
let lastIndex = string.lastIndexOf(" ");
return string.substring(0, lastIndex);
export function removeLast(string = " ") {
let arr = string.trim().split(" ");
if (arr.length > 2) {
return arr.slice(0, -1).join(" ");
}
return string;
}