From b754cb954343c852eb2c59623e4bdb71dea386df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D1=81=D1=8C=D0=BC=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=94?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=81?= <DOsmakov@vertex.spb.ru>
Date: Fri, 28 Feb 2020 18:40:57 +0300
Subject: [PATCH] text rename / reworked short name funct

---
 .../components/RejectTasks/RejectTasks.tsx    | 47 ++++++++-----------
 .../SummaryGlobalComponent.tsx                |  9 +++-
 .../components/SummaryWebPart.tsx             |  2 +-
 .../TaskStatusesChart/TaskStatusesChart.tsx   |  2 +-
 .../components/TrafficLight/TrafficLight.tsx  |  4 +-
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/webparts/summaryWebPart/components/RejectTasks/RejectTasks.tsx b/src/webparts/summaryWebPart/components/RejectTasks/RejectTasks.tsx
index 751a7af..edd40cc 100644
--- a/src/webparts/summaryWebPart/components/RejectTasks/RejectTasks.tsx
+++ b/src/webparts/summaryWebPart/components/RejectTasks/RejectTasks.tsx
@@ -31,9 +31,20 @@ export default class DeviationTaskTable extends React.Component<IComponentProps,
      </thead>
     ) 
   }
+
+  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)
                   )  
                 }   
               } 
@@ -115,6 +107,7 @@ export default class DeviationTaskTable extends React.Component<IComponentProps,
         } 
       } 
     }
+    
 
     return  (
       <tbody className={styles.commonTbody} >      
diff --git a/src/webparts/summaryWebPart/components/SummaryGlobalComponent/SummaryGlobalComponent.tsx b/src/webparts/summaryWebPart/components/SummaryGlobalComponent/SummaryGlobalComponent.tsx
index 094a195..7bd1ab7 100644
--- a/src/webparts/summaryWebPart/components/SummaryGlobalComponent/SummaryGlobalComponent.tsx
+++ b/src/webparts/summaryWebPart/components/SummaryGlobalComponent/SummaryGlobalComponent.tsx
@@ -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>
diff --git a/src/webparts/summaryWebPart/components/SummaryWebPart.tsx b/src/webparts/summaryWebPart/components/SummaryWebPart.tsx
index c225412..c44bb8c 100644
--- a/src/webparts/summaryWebPart/components/SummaryWebPart.tsx
+++ b/src/webparts/summaryWebPart/components/SummaryWebPart.tsx
@@ -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);
diff --git a/src/webparts/summaryWebPart/components/TaskStatusesChart/TaskStatusesChart.tsx b/src/webparts/summaryWebPart/components/TaskStatusesChart/TaskStatusesChart.tsx
index dab84fe..b18f3c5 100644
--- a/src/webparts/summaryWebPart/components/TaskStatusesChart/TaskStatusesChart.tsx
+++ b/src/webparts/summaryWebPart/components/TaskStatusesChart/TaskStatusesChart.tsx
@@ -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>
diff --git a/src/webparts/summaryWebPart/components/TrafficLight/TrafficLight.tsx b/src/webparts/summaryWebPart/components/TrafficLight/TrafficLight.tsx
index 8b0da5f..1bfd2dc 100644
--- a/src/webparts/summaryWebPart/components/TrafficLight/TrafficLight.tsx
+++ b/src/webparts/summaryWebPart/components/TrafficLight/TrafficLight.tsx
@@ -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