Merge pull request #3019 from OneCommunityGlobal/yashwanth_category_column

Yashwanth Category columns of projects page

Author: one-community

src/components/Projects/Project/Project.jsx

@@ -97,6 +97,9 @@ const Project = props => {
       } else {
         await props.modifyProject(projectData);
       }
+      if (props.projectData.category) {
+        setCategory(props.projectData.category);
+      }
     };
 
     onUpdateProject();

src/components/Reports/Reports.jsx

@@ -308,51 +308,52 @@ class ReportsPage extends Component {
     }));
   }
 
-//   showTotalProject() {
-//     if (this.state.showTotalProject) {
-//       this.setState({
-//         showTotalProject: false,
-//         loading: false,
-//       });
-//       return;
-//     }
-  
-//     this.setState({
-//       loading: true,
-//       showProjects: false,
-//       showPeople: false,
-//       showTeams: false,
-//       showTotalTeam: false,
-//       showTotalPeople: false,
-//       showTotalProject: false,  // Initially hide the report
-//       showAddTimeForm: false,
-//       showAddProjHistory: false,
-//       showAddPersonHistory: false,
-//       showAddTeamHistory: false,
-//     }, () => {
-//       setTimeout(() => {
-//         this.setState({
-//           loading: false,
-//           showTotalProject: true,  // Show the report after loading completes
-//         });
-//       }, 2000);  // Adjust the delay as needed
-//     });
-//   }
   showTotalProject() {
-    this.setState(prevState => ({
+    if (this.state.showTotalProject) {
+      this.setState({
+        showTotalProject: false,
+        loading: false,
+      });
+      return;
+    }
+  
+    this.setState({
+      loading: true,
       showProjects: false,
       showPeople: false,
       showTeams: false,
-      showTotalProject: !prevState.showTotalProject,
       showTotalTeam: false,
       showTotalPeople: false,
+      showTotalProject: false,  // Initially hide the report
       showAddTimeForm: false,
       showAddProjHistory: false,
       showAddPersonHistory: false,
       showAddTeamHistory: false,
-    }));
+    }, () => {
+      setTimeout(() => {
+        this.setState({
+          loading: false,
+          showTotalProject: true,  // Show the report after loading completes
+        });
+      }, 2000);  // Adjust the delay as needed
+    });
   }
 
+  // showTotalProject() {
+  //   this.setState(prevState => ({
+  //     showProjects: false,
+  //     showPeople: false,
+  //     showTeams: false,
+  //     showTotalProject: !prevState.showTotalProject,
+  //     showTotalTeam: false,
+  //     showTotalPeople: false,
+  //     showAddTimeForm: false,
+  //     showAddProjHistory: false,
+  //     showAddPersonHistory: false,
+  //     showAddTeamHistory: false,
+  //   }));
+  // }
+  
   showAddProjHistory() {
     this.setState(prevState => ({
       showProjects: false,
@@ -597,24 +598,18 @@ class ReportsPage extends Component {
                       />
                     </div>
                   </div>
-                  <div>
-                  <div className="total-report-item">
-                    <Button color="info" onClick={this.showTotalTeam}>
-                      {this.state.showTotalTeam ? 'Hide Total Team Report' : 'Show Total Team Report'}
-                    </Button>
-                    <div style={{ display: 'inline-block', marginLeft: 10 }}>
-                      <EditableInfoModal
-                        areaName="totalTeamReportInfoPoint"
-                       areaTitle="Total Team Report"
-                        role={userRole}
-                        fontSize={15}
-                       isPermissionPage
-                        darkMode={darkMode}
-                     />
-                   </div>
-              </div>
-              </div>
-                </div>
+                  
+                  
+                
+                <div>
+          <div className="total-report-item">
+  <Button color="info" onClick={this.showTotalProject}>
+    {this.state.showTotalProject ? 'Hide Total Project Report' : 'Show Total Project Report'}
+  </Button>
+</div>
+</div>
+</div>
+
                 {myRole != 'Owner' && (
                   <div className="lost-time-container">
                     <div className="lost-time-item">
@@ -761,15 +756,6 @@ class ReportsPage extends Component {
             {this.state.showTeams && (
               <TeamTable allTeams={this.state.teamSearchData} darkMode={darkMode} />
             )}
-            {this.state.showTotalProject && (
-              <TotalProjectReport
-                startDate={this.state.startDate}
-                endDate={this.state.endDate}
-                userProfiles={userProfilesBasicInfo}
-                projects={projects}
-                darkMode={darkMode}
-              />
-            )}
             {this.state.showTotalPeople && (
               <TotalPeopleReport
                 startDate={this.state.startDate}

src/components/Reports/TotalReport/TotalProjectReport.jsx

@@ -245,7 +245,7 @@ function TotalProjectReport(props) {
     <div>
       {!totalProjectReportDataReady ? (
         <div style={{ textAlign: 'center' }}>
-          <Loading align="center" darkMode={darkMode}/>
+          ""
           <div
             style={{
               width: '50%',