PSP-7884 add take completion date.

source/backend/api/Services/TakeService.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Security.Claims;
 using Microsoft.Extensions.Logging;
+using Pims.Api.Constants;
 using Pims.Api.Models.CodeTypes;
 using Pims.Core.Exceptions;
 using Pims.Dal.Entities;
@@ -70,6 +71,10 @@ public IEnumerable<PimsTake> UpdateAcquisitionPropertyTakes(long acquisitionFile
  {
  throw new BusinessRuleViolationException("Retired records are referenced for historical purposes only and cannot be edited or deleted. If the take has been added in error, contact your system administrator to re-open the file, which will allow take deletion.");
  }
+ else if (takes.Any(t => t.TakeStatusTypeCode == AcquisitionTakeStatusTypes.COMPLETE.ToString() && t.CompletionDt == null))
+ {
+ throw new BusinessRuleViolationException("A completed take must have a completion date.");
+ }
  else
  {
  // Complete Takes can only be deleted or set to InProgress by Admins when File is Active/Draft

source/backend/apimodels/Models/Concepts/Take/TakeMap.cs

@@ -32,6 +32,7 @@ public void Register(TypeAdapterConfig config)
  .Map(dest => dest.TakeTypeCode, src => src.TakeTypeCodeNavigation)
  .Map(dest => dest.TakeStatusTypeCode, src => src.TakeStatusTypeCodeNavigation)
  .Map(dest => dest.LandActTypeCode, src => src.LandActTypeCodeNavigation)
+ .Map(dest => dest.CompletionDt, src => src.CompletionDt)
  .Inherits<Entity.IBaseAppEntity, BaseAuditModel>();
 
  config.NewConfig<TakeModel, Entity.PimsTake>()
@@ -58,6 +59,7 @@ public void Register(TypeAdapterConfig config)
  .Map(dest => dest.TakeTypeCode, src => src.TakeTypeCode.Id)
  .Map(dest => dest.TakeStatusTypeCode, src => src.TakeStatusTypeCode.Id)
  .Map(dest => dest.LandActTypeCode, src => src.LandActTypeCode.Id)
+ .Map(dest => dest.CompletionDt, src => src.CompletionDt)
  .Inherits<BaseAuditModel, Entity.IBaseAppEntity>();
  }
  }

source/backend/apimodels/Models/Concepts/Take/TakeModel.cs

@@ -39,6 +39,8 @@ public class TakeModel : BaseAuditModel
 
  public DateOnly? LandActEndDt { get; set; }
 
+ public DateOnly? CompletionDt { get; set; }
+
  public AcquisitionFileModel PropertyAcquisitionFile { get; set; }
 
  public long PropertyAcquisitionFileId { get; set; }

source/frontend/src/components/common/form/FastDatePicker.tsx

@@ -25,6 +25,8 @@ type OptionalAttributes = {
  innerClassName?: string;
  /** The minimum data allowable to be chosen in the datepicker */
  minDate?: Date;
+ /** The maximum date allowable to be chosen in the datepicker */
+ maxDate?: Date;
  /** form label */
  label?: string;
  /** Whether the field is required. Makes the field border blue. */
@@ -48,6 +50,7 @@ const FormikDatePicker: FunctionComponent<React.PropsWithChildren<FastDatePicker
  className,
  innerClassName,
  minDate,
+ maxDate,
  label,
  required,
  popperModifiers,
@@ -100,6 +103,7 @@ const FormikDatePicker: FunctionComponent<React.PropsWithChildren<FastDatePicker
  selected={(value && new Date(value)) || null}
  disabled={disabled}
  minDate={minDate ? moment(minDate, 'YYYY-MM-DD').toDate() : undefined}
+ maxDate={maxDate}
  {...rest}
  popperModifiers={popperModifiers}
  onBlur={() => {

source/frontend/src/features/mapSideBar/property/tabs/takes/detail/TakesDetailView.tsx

@@ -12,11 +12,11 @@ import TooltipIcon from '@/components/common/TooltipIcon';
 import AreaContainer from '@/components/measurements/AreaContainer';
 import * as API from '@/constants/API';
 import { Claims } from '@/constants/claims';
-import { TakesStatusTypes } from '@/constants/takesStatusTypes';
 import { isAcquisitionFile } from '@/features/mapSideBar/acquisition/add/models';
 import StatusUpdateSolver from '@/features/mapSideBar/acquisition/tabs/fileDetails/detail/statusUpdateSolver';
 import useKeycloakWrapper from '@/hooks/useKeycloakWrapper';
 import useLookupCodeHelpers from '@/hooks/useLookupCodeHelpers';
+import { ApiGen_CodeTypes_AcquisitionTakeStatusTypes } from '@/models/api/generated/ApiGen_CodeTypes_AcquisitionTakeStatusTypes';
 import { ApiGen_Concepts_FileProperty } from '@/models/api/generated/ApiGen_Concepts_FileProperty';
 import { ApiGen_Concepts_Take } from '@/models/api/generated/ApiGen_Concepts_Take';
 import { getApiPropertyName, prettyFormatDate, prettyFormatUTCDate } from '@/utils';
@@ -39,10 +39,10 @@ export const TakesDetailView: React.FunctionComponent<ITakesDetailViewProps> = (
  onEdit,
 }) => {
  const cancelledTakes = takes?.filter(
- t => t.takeStatusTypeCode?.id === TakesStatusTypes.CANCELLED,
+ t => t.takeStatusTypeCode?.id === ApiGen_CodeTypes_AcquisitionTakeStatusTypes.CANCELLED,
  );
  const nonCancelledTakes = takes?.filter(
- t => t.takeStatusTypeCode?.id !== TakesStatusTypes.CANCELLED,
+ t => t.takeStatusTypeCode?.id !== ApiGen_CodeTypes_AcquisitionTakeStatusTypes.CANCELLED,
  );
  const takesNotInFile = allTakesCount - (takes?.length ?? 0);
 
@@ -114,6 +114,11 @@ export const TakesDetailView: React.FunctionComponent<ITakesDetailViewProps> = (
  ? getCodeById(API.TAKE_STATUS_TYPES, take.takeStatusTypeCode.id)
  : ''}
  </SectionField>
+ {take.completionDt && (
+ <SectionField label="Completion date *">
+ {prettyFormatDate(take.completionDt)}
+ </SectionField>
+ )}
  <SectionField label="Site contamination">
  {take.takeSiteContamTypeCode?.id
  ? getCodeById(API.TAKE_SITE_CONTAM_TYPES, take.takeSiteContamTypeCode.id)

source/frontend/src/features/mapSideBar/property/tabs/takes/repositories/useTakesRepository.tsx

@@ -67,6 +67,7 @@ export const useTakesRepository = () => {
  requestName: 'UpdateTakesByAcquisitionPropertyId',
  onSuccess: useAxiosSuccessHandler(),
  onError: useAxiosErrorHandler(),
+ throwError: true,
  });
 
  return useMemo(

source/frontend/src/features/mapSideBar/property/tabs/takes/update/TakeSubForm.tsx

@@ -54,6 +54,15 @@ const TakeSubForm: React.FunctionComponent<ITakeSubFormProps> = ({
  );
  const takeStatusTypeCode = getIn(values, withNameSpace(nameSpace, 'takeStatusTypeCode'));
 
+ React.useEffect(() => {
+ if (
+ currentTake.completionDt &&
+ currentTake.takeStatusTypeCode !== ApiGen_CodeTypes_AcquisitionTakeStatusTypes.COMPLETE
+ ) {
+ setFieldValue(withNameSpace(nameSpace, 'completionDt'), '');
+ }
+ }, [currentTake.completionDt, currentTake.takeStatusTypeCode, nameSpace, setFieldValue]);
+
  const getModalWarning = (onOk: () => void) => {
  return (e: React.ChangeEvent<any>) => {
  if (e.target.value === 'false') {
@@ -121,6 +130,24 @@ const TakeSubForm: React.FunctionComponent<ITakeSubFormProps> = ({
  disabled={!canEditTake}
  />
  </SectionField>
+ <SectionField
+ label="Completion date"
+ required={
+ currentTake.takeStatusTypeCode === ApiGen_CodeTypes_AcquisitionTakeStatusTypes.COMPLETE
+ }
+ tooltip={`This will be enabled when the file status is set to "Completed"`}
+ labelWidth="4"
+ contentWidth="5"
+ >
+ <FastDatePicker
+ formikProps={formikProps}
+ field={withNameSpace(nameSpace, 'completionDt')}
+ maxDate={new Date()}
+ disabled={
+ currentTake.takeStatusTypeCode !== ApiGen_CodeTypes_AcquisitionTakeStatusTypes.COMPLETE
+ }
+ />
+ </SectionField>
  <SectionField label="Site contamination" labelWidth="4" contentWidth="5">
  <Select
  field={withNameSpace(nameSpace, 'takeSiteContamTypeCode')}

source/frontend/src/features/mapSideBar/property/tabs/takes/update/TakesUpdateContainer.tsx

@@ -56,8 +56,10 @@ export const TakesUpdateContainer = React.forwardRef<FormikProps<any>, ITakesDet
  t.propertyAcquisitionFileId = fileProperty.id ?? 0;
  return t.toApi();
  });
- fileProperty.id && (await updateTakesByPropertyFile(fileProperty.id, takes));
- onSuccess();
+ if (fileProperty.id) {
+ await updateTakesByPropertyFile(fileProperty.id, takes);
+ onSuccess();
+ }
  } finally {
  formikHelpers.setSubmitting(false);
  }

source/frontend/src/features/mapSideBar/property/tabs/takes/update/TakesUpdateForm.tsx

@@ -122,6 +122,7 @@ export const emptyTake: ApiGen_Concepts_Take = {
  takeTypeCode: null,
  takeStatusTypeCode: toTypeCode('INPROGRESS'),
  landActTypeCode: null,
+ completionDt: null,
  ...getEmptyBaseAudit(),
 };