Total:
- {duration}
- {startEndDates}
+ {duration}
+ {minStartDate.format('YYYY-MM-DD')}
+ {maxEndDate.format('YYYY-MM-DD')}
{parseInt(price, 10) > 0 &&
price
}
@@ -29,14 +31,16 @@ const PhaseCardListFooter = ({
PhaseCardListFooter.defaultProps = {
duration: null,
price: null,
- startEndDates: null,
+ minStartDate: null,
+ maxEndDate: null,
projectId: 0
}
PhaseCardListFooter.propTypes = {
duration: PT.string,
price: PT.string,
- startEndDates: PT.string
+ minStartDate: PT.Date,
+ maxEndDate: PT.Date,
}
export default PhaseCardListFooter
diff --git a/src/projects/detail/components/PhaseCardListFooter/PhaseCardListFooter.scss b/src/projects/detail/components/PhaseCardListFooter/PhaseCardListFooter.scss
index e75d0e0a2..215ecb783 100644
--- a/src/projects/detail/components/PhaseCardListFooter/PhaseCardListFooter.scss
+++ b/src/projects/detail/components/PhaseCardListFooter/PhaseCardListFooter.scss
@@ -51,14 +51,17 @@
.meta-list {
.meta {
- &::after {
- content: " • ";
+ color: $tc-gray-30;
+ margin-left: 10px;
+
+ label {
display: inline-block;
- margin: 0 $base-unit;
+ color: $tc-white;
+ margin-right: 5px;
}
- &:last-child::after {
- display: none;
+ &:first-child {
+ margin-left: 0px;
}
&.meta-dark {
diff --git a/src/projects/detail/components/PhaseCardListHeader/PhaseCardListHeader.scss b/src/projects/detail/components/PhaseCardListHeader/PhaseCardListHeader.scss
index 58d4977c2..e2f1bddc7 100644
--- a/src/projects/detail/components/PhaseCardListHeader/PhaseCardListHeader.scss
+++ b/src/projects/detail/components/PhaseCardListHeader/PhaseCardListHeader.scss
@@ -25,6 +25,7 @@
}
.status {
+ display: none;
flex: 0 55px;
min-width: 55px;
text-align: center;
diff --git a/src/projects/detail/components/ProjectStage.jsx b/src/projects/detail/components/ProjectStage.jsx
index 751841f67..24be9434a 100644
--- a/src/projects/detail/components/ProjectStage.jsx
+++ b/src/projects/detail/components/ProjectStage.jsx
@@ -57,13 +57,13 @@ function formatPhaseCardAttr(phase, phaseIndex, productTemplates, feed, timeline
} = getPhaseActualData(phase, timeline)
const duration = `${plannedDuration} day${plannedDuration !== 1 ? 's' : ''}`
- let startEndDates = startDate ? `${startDate.format('MMM D')}` : ''
- // appends end date to the start date only if end date is greater than start date
- startEndDates += startDate && endDate && endDate.diff(startDate, 'days') > 0 ? `-${endDate.format('MMM D')}` : ''
- // extracts the start date's month string plus white space
- const monthStr = startEndDates.substr(0, 4)
- // replaces the second occurrence of the month part i.e. removes the end date's month part
- startEndDates = startEndDates.lastIndexOf(monthStr) !== 0 ? startEndDates.replace(`-${monthStr}`, '-') : startEndDates
+ // let startEndDates = startDate ? `${startDate.format('MMM D')}` : ''
+ // // appends end date to the start date only if end date is greater than start date
+ // startEndDates += startDate && endDate && endDate.diff(startDate, 'days') > 0 ? `-${endDate.format('MMM D')}` : ''
+ // // extracts the start date's month string plus white space
+ // const monthStr = startEndDates.substr(0, 4)
+ // // replaces the second occurrence of the month part i.e. removes the end date's month part
+ // startEndDates = startEndDates.lastIndexOf(monthStr) !== 0 ? startEndDates.replace(`-${monthStr}`, '-') : startEndDates
const actualPrice = phase.spentBudget
let paidStatus = 'Quoted'
@@ -81,7 +81,7 @@ function formatPhaseCardAttr(phase, phaseIndex, productTemplates, feed, timeline
icon,
title,
duration,
- startEndDates,
+ // startEndDates,
price,
paidStatus,
status,
@@ -216,6 +216,7 @@ class ProjectStage extends React.Component{
deleteProjectPhase(project.id, phase.id)}
timeline={timeline}
hasUnseen={hasAnyNotifications}
@@ -225,50 +226,52 @@ class ProjectStage extends React.Component{
expandProjectPhase={expandProjectPhase}
project={project}
>
-
-
-
- {currentActiveTab === 'timeline' &&
-
- }
-
- {currentActiveTab === 'posts' && (
-
- )}
-
- {currentActiveTab === 'specification' &&
-
-
- updateProduct(project.id, phase.id, product.id, model)}
- saving={isProcessing}
- fireProjectDirty={(values) => fireProductDirty(phase.id, product.id, values)}
- fireProjectDirtyUndo= {fireProductDirtyUndo}
- addAttachment={this.addProductAttachment}
- updateAttachment={this.updateProductAttachment}
- removeAttachment={this.removeProductAttachment}
- attachmentsStorePath={attachmentsStorePath}
- canManageAttachments={hasPermission(PERMISSIONS.EDIT_PROJECT_SPECIFICATION)}
- disableAutoScrolling
- />
-
- }
-
+
+
+ {currentActiveTab === 'timeline' &&
+
+ }
+
+ {currentActiveTab === 'posts' && (
+
+ )}
+
+ {currentActiveTab === 'specification' &&
+
+
+ updateProduct(project.id, phase.id, product.id, model)}
+ saving={isProcessing}
+ fireProjectDirty={(values) => fireProductDirty(phase.id, product.id, values)}
+ fireProjectDirtyUndo= {fireProductDirtyUndo}
+ addAttachment={this.addProductAttachment}
+ updateAttachment={this.updateProductAttachment}
+ removeAttachment={this.removeProductAttachment}
+ attachmentsStorePath={attachmentsStorePath}
+ canManageAttachments={hasPermission(PERMISSIONS.EDIT_PROJECT_SPECIFICATION)}
+ disableAutoScrolling
+ />
+
+ }
+
)
}
diff --git a/src/projects/detail/components/ProjectStages.jsx b/src/projects/detail/components/ProjectStages.jsx
index 7953ea54f..36f624a58 100644
--- a/src/projects/detail/components/ProjectStages.jsx
+++ b/src/projects/detail/components/ProjectStages.jsx
@@ -43,8 +43,8 @@ function formatPhaseCardListFooterProps(phases, productsTimelines) {
const minStartDate = startDates.length > 0 ? moment.min(startDates) : null
const maxEndDate = endDates.length > 0 ? moment.max(endDates) : null
- let startEndDates = minStartDate ? `${minStartDate.format('MMM D')}` : ''
- startEndDates += minStartDate && maxEndDate ? `–${maxEndDate.format('MMM D')}` : ''
+ // let startEndDates = minStartDate ? `${minStartDate.format('MMM D')}` : ''
+ // startEndDates += minStartDate && maxEndDate ? `–${maxEndDate.format('MMM D')}` : ''
const totalPrice = _.sumBy(filteredPhases, 'budget')
@@ -54,7 +54,9 @@ function formatPhaseCardListFooterProps(phases, productsTimelines) {
return {
duration,
- startEndDates,
+ // startEndDates,
+ minStartDate,
+ maxEndDate,
price
}
}
diff --git a/src/projects/detail/containers/DashboardContainer.jsx b/src/projects/detail/containers/DashboardContainer.jsx
index 43420918e..329925369 100644
--- a/src/projects/detail/containers/DashboardContainer.jsx
+++ b/src/projects/detail/containers/DashboardContainer.jsx
@@ -28,7 +28,8 @@ import {
expandProjectPhase,
collapseProjectPhase,
collapseAllProjectPhases,
- createPhaseAndMilestones
+ createPhaseAndMilestones,
+ createPhaseWithoutTimeline,
} from '../../actions/project'
import { addProductAttachment, updateProductAttachment, removeProductAttachment } from '../../actions/projectAttachment'
@@ -118,14 +119,18 @@ class DashboardContainer extends React.Component {
}
onFormSubmit(type, phase, milestones) {
- const { project, createPhaseAndMilestones } = this.props
+ const { project, createPhaseAndMilestones, createPhaseWithoutTimeline } = this.props
const productTemplate = {
name: phase.title,
+ description: phase.description,
id: PHASE_PRODUCT_TEMPLATE_ID,
}
-
- createPhaseAndMilestones(project, productTemplate, type, phase.startDate, phase.endDate, milestones)
+ if (project.version === 'v4') {
+ createPhaseWithoutTimeline(project, productTemplate, type, phase.startDate, phase.endDate)
+ } else {
+ createPhaseAndMilestones(project, productTemplate, type, phase.startDate, phase.endDate, milestones)
+ }
}
@@ -284,6 +289,7 @@ class DashboardContainer extends React.Component {
{isCreatingPhase?
: null}
{isProjectLive && !isCreatingPhase && hasPermission(PERMISSIONS.MANAGE_PROJECT_PLAN) && !isLoadingPhases && (
)}
@@ -324,6 +330,7 @@ const mapDispatchToProps = {
toggleBundledNotificationRead,
updateProduct,
createPhaseAndMilestones,
+ createPhaseWithoutTimeline,
fireProductDirty,
fireProductDirtyUndo,
addProductAttachment,
diff --git a/src/projects/detail/containers/SecondaryToolBarContainer.jsx b/src/projects/detail/containers/SecondaryToolBarContainer.jsx
index 0ad5e252e..74c9a4009 100644
--- a/src/projects/detail/containers/SecondaryToolBarContainer.jsx
+++ b/src/projects/detail/containers/SecondaryToolBarContainer.jsx
@@ -21,7 +21,7 @@ const SecondaryToolBarContainer = ({
}
// choose set of menu links based on the project version
- const navLinks = project.version === 'v3' ? [
+ const navLinks = ['v3', 'v4'].includes(project.version) ? [
{ label: 'Dashboard', to: `/projects/${match.params.projectId}` },
{ label: 'Messages', to: `/projects/${match.params.projectId}/messages` },
{ label: 'Scope', to: `/projects/${match.params.projectId}/scope` },
diff --git a/src/projects/reducers/project.js b/src/projects/reducers/project.js
index d48a85a8f..5ceb3a85d 100644
--- a/src/projects/reducers/project.js
+++ b/src/projects/reducers/project.js
@@ -24,7 +24,7 @@ import {
ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE, ACCEPT_OR_REFUSE_INVITE_PENDING,
UPLOAD_PROJECT_ATTACHMENT_FILES, DISCARD_PROJECT_ATTACHMENT, CHANGE_ATTACHMENT_PERMISSION,
CREATE_SCOPE_CHANGE_REQUEST_SUCCESS, APPROVE_SCOPE_CHANGE_SUCCESS, REJECT_SCOPE_CHANGE_SUCCESS, CANCEL_SCOPE_CHANGE_SUCCESS, ACTIVATE_SCOPE_CHANGE_SUCCESS,
- LOAD_PROJECT_MEMBERS_SUCCESS, LOAD_PROJECT_MEMBER_INVITES_SUCCESS, LOAD_PROJECT_MEMBER_SUCCESS
+ LOAD_PROJECT_MEMBERS_SUCCESS, LOAD_PROJECT_MEMBER_INVITES_SUCCESS, LOAD_PROJECT_MEMBER_SUCCESS, CREATE_PROJECT_PHASE_PENDING, CREATE_PROJECT_PHASE_SUCCESS
} from '../../config/constants'
import _ from 'lodash'
import update from 'react-addons-update'
@@ -147,10 +147,12 @@ export const projectState = function (state=initialState, action) {
switch (action.type) {
case CREATE_PROJECT_PHASE_TIMELINE_MILESTONES_PENDING:
+ case CREATE_PROJECT_PHASE_PENDING:
return Object.assign({}, state, {
isCreatingPhase: true
})
- case CREATE_PROJECT_PHASE_TIMELINE_MILESTONES_SUCCESS: {
+ case CREATE_PROJECT_PHASE_TIMELINE_MILESTONES_SUCCESS:
+ case CREATE_PROJECT_PHASE_SUCCESS: {
const { phase, product } = action.payload
phase.products = [product]
return update(state, {
diff --git a/src/reducers/alerts.js b/src/reducers/alerts.js
index 647058900..9ed828d00 100644
--- a/src/reducers/alerts.js
+++ b/src/reducers/alerts.js
@@ -68,7 +68,8 @@ import {
APPROVE_SCOPE_CHANGE_FAILURE,
REJECT_SCOPE_CHANGE_FAILURE,
CANCEL_SCOPE_CHANGE_FAILURE,
- ACTIVATE_SCOPE_CHANGE_FAILURE
+ ACTIVATE_SCOPE_CHANGE_FAILURE,
+ CREATE_PROJECT_PHASE_SUCCESS
} from '../config/constants'
/* eslint-enable no-unused-vars */
@@ -83,7 +84,8 @@ export default function(state = {}, action) {
return state
}
- case CREATE_PROJECT_PHASE_TIMELINE_MILESTONES_SUCCESS: {
+ case CREATE_PROJECT_PHASE_TIMELINE_MILESTONES_SUCCESS:
+ case CREATE_PROJECT_PHASE_SUCCESS: {
Alert.success('Project phase created.')
return state
}