text rename / reworked short name funct

VRTKSSUP-229
Осьмаков Денис 5 years ago
parent 67aff2a3ad
commit b754cb9543
  1. 47
      src/webparts/summaryWebPart/components/RejectTasks/RejectTasks.tsx
  2. 9
      src/webparts/summaryWebPart/components/SummaryGlobalComponent/SummaryGlobalComponent.tsx
  3. 2
      src/webparts/summaryWebPart/components/SummaryWebPart.tsx
  4. 2
      src/webparts/summaryWebPart/components/TaskStatusesChart/TaskStatusesChart.tsx
  5. 4
      src/webparts/summaryWebPart/components/TrafficLight/TrafficLight.tsx

@ -32,8 +32,19 @@ export default class DeviationTaskTable extends React.Component<IComponentProps,
)
}
private _renderBodyTable(structureData:any): JSX.Element {
public converToShortFIO = (fio: string) => {
let result = '';
const splitedFIO = fio.split(' ');
if (splitedFIO.length < 3) {
result = `${splitedFIO[0]} ${splitedFIO[1][0].toUpperCase()}.`
} else {
result = `${splitedFIO[0]} ${splitedFIO[1][0].toUpperCase()}. ${splitedFIO[2][0].toUpperCase()}.`
}
return result;
}
private _renderBodyTable(structureData:any): JSX.Element {
var structureTable = [] //В этом массив пушиться вся структура таблицы (tr td)
// Прохожусь по всему приходящему массиву. Через функции _cell() и _customCell пушу ячеейки в structureTable. Так же в этой фунции определяться rowSpan и сокращаеться value до ФИО
@ -54,20 +65,11 @@ export default class DeviationTaskTable extends React.Component<IComponentProps,
if(structureData.Departments[i].Managers){
for (let index = 0; index < structureData.Departments[i].Managers.length; index++) {
let menagers = structureData.Departments[i].Managers[index].Name;
let manager = structureData.Departments[i].Managers[index].Name;
if(menagers){
if (manager){
//Сокращаю Имена и Отчества Пример Масловский Артем Андреевич Масловский А.А.
let ManagersName = structureData.Departments[i].Managers[index].Name.split(' ');
let name = ManagersName[1].split('')[0] + '.';
let surname = ManagersName[0];
if(ManagersName[2]){
let patronymic = ManagersName[1].split('')[0] + '.';
ManagersName = surname + ' ' + name + ' ' + patronymic;
} else {
ManagersName = surname + ' ' + name;
}
const ManagersName = this.converToShortFIO(manager);
let maxLength = 0;
@ -87,26 +89,16 @@ export default class DeviationTaskTable extends React.Component<IComponentProps,
if(structureData.Departments[i].Managers[index].Members.length){
for (let counter = 0; counter < structureData.Departments[i].Managers[index].Members.length; counter++) {
let MembersName = structureData.Departments[i].Managers[index].Members[counter].Name
if(MembersName) {
let membersName = structureData.Departments[i].Managers[index].Members[counter].Name
if(membersName) {
//Сокращаю Имена и Отчества Пример Масловский Артем Андреевич Масловский А.А.
MembersName = MembersName.split(' ');
let name = MembersName[1].split('')[0] + '.';
let surname = MembersName[0];
if(MembersName[2]){
MembersName[2].split('')[0];
let patronymic = MembersName[2].split('')[0] + '.';
MembersName = surname + ' ' + name + ' ' + patronymic;
} else {
MembersName = surname + ' ' + name
}
membersName = this.converToShortFIO(membersName);
}
let isCrit = structureData.Departments[i].Managers[index].Members[counter].Crit
structureTable.push(
this._customCell( MembersName , structureData.Departments[i].Managers[index].Members[counter].TaskCount,isCrit)
this._customCell( membersName , structureData.Departments[i].Managers[index].Members[counter].TaskCount,isCrit)
)
}
}
@ -116,6 +108,7 @@ export default class DeviationTaskTable extends React.Component<IComponentProps,
}
}
return (
<tbody className={styles.commonTbody} >
{structureTable}

@ -17,6 +17,13 @@ export interface IComponentProps {
export default class SummaryGlobalComponent extends React.Component<IComponentProps, {}> {
componentDidMount() {
let stl = document.createElement('link');
stl.setAttribute('rel', 'stylesheet');
stl.setAttribute('href', '/Style%20Library/summaryStyles.css');
document.documentElement.appendChild(stl);
}
public render(): React.ReactElement<IComponentProps> {
const { data, rowsOrder, context } = this.props;
@ -37,7 +44,7 @@ export default class SummaryGlobalComponent extends React.Component<IComponentPr
</div>
<div className={styles.SummaryPageColumnTwo}>
<h1 className={styles.Title} style={{ fontSize: '13px' }}>ЗАДАЧИ С ОТКЛОНЕНИЕМ</h1>
<div style={{ background: 'rgb(243, 243, 243)', border: '1px solid #ccc', padding: '2px', width: '103%' }}>
<div style={{ background: 'rgb(243, 243, 243)', border: '1px solid #ccc', padding: '2px' }}>
<RejectTasks structureData={data.DeviationTasks} />
</div>
</div>

@ -51,7 +51,7 @@ export default class SummaryWebPart extends React.Component<ISummaryWebPartProps
document.body.appendChild(scripts);
let relUrl = context.pageContext.web.serverRelativeUrl;
let projectCode = relUrl ? relUrl.split('/')[relUrl.split('/').length - 1] : ''; /* 'UNI_UNI_002' */
let projectCode = relUrl ? relUrl.split('/')[relUrl.split('/').length - 1] : ''; /* 'ICT_UNI_023' */
let web = new Web('http://portal.vertex.spb.ru/PMIS');
let thisWeb = new Web('http://portal.vertex.spb.ru/PMIS/' + projectCode);

@ -27,7 +27,7 @@ export default class TaskStatusesChart extends React.Component<IComponentProps,
}
public render(): React.ReactElement<IComponentProps> {
const { taskStats } = this.props;
let chartTitle = 'Текущee состояние проекта (всего задач: '+( Number(taskStats.exec) + Number(taskStats.plan) + Number(taskStats.compl))+' шт.)'
let chartTitle = 'Всего задач по проекту: '+( Number(taskStats.exec) + Number(taskStats.plan) + Number(taskStats.compl))+' шт.'
return (
<div >
<div><h1 style={{textAlign: 'center', fontSize: '13px', color: '#666',textTransform: 'uppercase'}}>{chartTitle}</h1></div>

@ -35,7 +35,7 @@ export default class TrafficLight extends React.Component<IComponentProps, {}> {
result.push(
{
key: index,
fieldName: "Срок",
fieldName: "Длительность",
status: statuses.term
});
++index;
@ -156,7 +156,7 @@ export default class TrafficLight extends React.Component<IComponentProps, {}> {
},
{
key: "column4",
name: "Актуальный статус",
name: "Статус выполнения",
fieldName: "allTasks",
minWidth: 110,
maxWidth: 110

Loading…
Cancel
Save