wip

Author: sezanzeb

backend/src/controllers/dto.ts

@@ -34,6 +34,7 @@ import {
   EmailTemplateSize,
   FrontendSettings,
   Settings,
+  ProjectSettings,
 } from "../entities/settings";
 import { User } from "../entities/user";
 import { UserRole } from "../entities/user-role";
@@ -91,6 +92,22 @@ export class ApplicationSettingsDTO implements DTO<ApplicationSettings> {
   @IsNumber()
   @Expose()
   public hoursToConfirm!: number;
+  @Type(() => Date)
+  @IsDate()
+  @Expose()
+  public fillProfileFormFrom!: Date;
+  @Type(() => Date)
+  @IsDate()
+  @Expose()
+  public fillProfileFormUntil!: Date;
+  @Type(() => Date)
+  @IsDate()
+  @Expose()
+  public acceptanceDeadline!: Date;
+  @Type(() => Date)
+  @IsDate()
+  @Expose()
+  public confirmSpotUntil!: Date;
 }
 
 export class ProjectSettingsDTO implements DTO<ProjectSettings> {

backend/src/entities/application-settings.ts

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

backend/src/entities/settings.ts

@@ -71,7 +71,7 @@ export class Settings {
   public email!: EmailSettings;
   @Type(() => ProjectSettings)
   @Column(() => ProjectSettings)
-  public rating!: ProjectSettings;
+  public project!: ProjectSettings;
 }
 
 /**

backend/src/services/settings-service.ts

@@ -9,6 +9,7 @@ import {
   EmailTemplate,
   FrontendSettings,
   Settings,
+  ProjectSettings,
 } from "../entities/settings";
 import {
   ConfigurationServiceToken,
@@ -102,6 +103,7 @@ export class SettingsService implements ISettingsService {
     settings.application = this.getDefaultApplicationSettings();
     settings.frontend = this.getDefaultFrontendSettings();
     settings.email = this.getDefaultEmailSettings();
+    settings.project = this.getDefaultProjectSettings();
     return settings;
   }
 

frontend/src/components/pages/status.tsx

@@ -30,7 +30,7 @@ export const Status = () => {
 
   const confirmationDays = Math.floor(settings.application.hoursToConfirm / 24);
   const fillProfileFormFrom = settings.application.fillProfileFormFrom;
-  const fillProfileFormTo = settings.application.fillProfileFormTo;
+  const fillProfileFormUntil = settings.application.fillProfileFormUntil;
   const acceptanceDeadline = settings.application.acceptanceDeadline;
   const confirmSpotUntil = settings.application.confirmSpotUntil;
   const isExpired = user == null ? false : isConfirmationExpired(user);
@@ -102,7 +102,7 @@ export const Status = () => {
                 <InternalLink to={Routes.ProfileForm}>
                   profile form
                 </InternalLink>
-                , any time between <b>{fillProfileFormFrom} - {fillProfileFormTo}</b>
+                , any time between <b>{fillProfileFormFrom} - {fillProfileFormUntil}</b>
               </Text>
             </>
           )}

frontend/src/components/settings/project-rating/rating-criteria-settings.tsx

@@ -91,7 +91,7 @@ export const ProjectProjectSettings = () => {
 
   useEffect(() => {
     // Only update if settings are loaded
-    if (settings.rating) {
+    if (settings.project) {
       api.updateSettings(settings as SettingsDTO);
     }
   }, [settings]);