wip

Author: sezanzeb

backend/src/controllers/dto.ts

@@ -95,14 +95,6 @@ export class ApplicationSettingsDTO implements DTO<ApplicationSettings> {
   @Type(() => Date)
   @IsDate()
   @Expose()
-  public fillProfileFormFrom!: Date;
-  @Type(() => Date)
-  @IsDate()
-  @Expose()
-  public fillProfileFormUntil!: Date;
-  @Type(() => Date)
-  @IsDate()
-  @Expose()
   public acceptanceDeadline!: Date;
   @Type(() => Date)
   @IsDate()
@@ -186,6 +178,10 @@ export class SettingsDTO implements DTO<Omit<Settings, "updatedAt">> {
   @ValidateNested()
   @Expose()
   public email!: EmailSettingsDTO;
+  @Type(() => ProjectSettingsDTO)
+  @ValidateNested()
+  @Expose()
+  public project!: ProjectSettingsDTO;
 }
 
 export abstract class QuestionConfigurationDTOBase {

backend/src/entities/application-settings.ts

@@ -30,10 +30,6 @@ export class ApplicationSettings {
   @Column()
   public hoursToConfirm!: number;
   @Column()
-  public fillProfileFormFrom!: Date;
-  @Column()
-  public fillProfileFormUntil!: Date;
-  @Column()
   public acceptanceDeadline!: Date;
   @Column()
   public confirmSpotUntil!: Date;

backend/src/services/settings-service.ts

@@ -117,6 +117,8 @@ export class SettingsService implements ISettingsService {
     applicationSettings.allowProfileFormFrom = new Date();
     applicationSettings.allowProfileFormUntil = new Date();
     applicationSettings.hoursToConfirm = 24;
+    applicationSettings.acceptanceDeadline = new Date();
+    applicationSettings.confirmSpotUntil = new Date();
     return applicationSettings;
   }
 

frontend/src/components/pages/status.tsx

@@ -29,14 +29,22 @@ export const Status = () => {
   const { user, updateUser } = useLoginContext();
 
   const confirmationDays = Math.floor(settings.application.hoursToConfirm / 24);
-  const fillProfileFormFrom = dateToString(
-    settings.application.fillProfileFormFrom,
+
+  const allowProfileFormFrom = dateToString(
+    settings.application.allowProfileFormFrom,
+  );
+  const allowProfileFormUntil = dateToString(
+    settings.application.allowProfileFormUntil,
   );
-  const fillProfileFormTo = dateToString(settings.application.fillProfileFormTo);
   const acceptanceDeadline = dateToString(
     settings.application.acceptanceDeadline,
   );
-  const confirmSpotUntil = dateToString(settings.application.confirmSpotUntil);
+  const confirmSpotUntil = dateToString(
+    settings.application.confirmSpotUntil,
+  );
+
+  console.log(settings.application);
+
   const isExpired = user == null ? false : isConfirmationExpired(user);
   const isNotAttending = isExpired || user?.declined;
   const deadline = user?.confirmationExpiresAt;
@@ -106,7 +114,7 @@ export const Status = () => {
                 <InternalLink to={Routes.ProfileForm}>
                   profile form
                 </InternalLink>
-                , any time between <b>{fillProfileFormFrom} - {fillProfileFormUntil}</b>
+                , any time between <b>{allowProfileFormFrom} - {allowProfileFormUntil}</b>
               </Text>
             </>
           )}

frontend/src/util.ts

@@ -16,7 +16,11 @@ export const sleep = (ms: number) =>
  * Formats a date "YYYY-MM-DD on HH:mm:ss" style.
  * @param date The date to format
  */
-export const dateToString = (date: Date) => {
+export const dateToString = (date: Date | null) => {
+  if (date == null) {
+    return "?"
+  }
+
   return date.toLocaleString("default", {
     year: "numeric",
     month: "long",