Skip to content

Commit

Permalink
release: 3.29.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tomwwinter authored Jan 17, 2024
2 parents cbdddd9 + 1eac977 commit 5ed1de9
Show file tree
Hide file tree
Showing 137 changed files with 3,205 additions and 2,937 deletions.
90 changes: 45 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"@casl/ability": "^6.5.0",
"@casl/angular": "^8.2.3",
"@faker-js/faker": "^8.3.1",
"@fortawesome/angular-fontawesome": "^0.14.0",
"@fortawesome/angular-fontawesome": "^0.14.1",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@ngneat/until-destroy": "^10.0.0",
"@sentry/browser": "^7.88.0",
"@sentry/browser": "^7.91.0",
"angulartics2": "^12.2.1",
"assert": "^2.1.0",
"crypto-es": "^2.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import { Component, OnInit } from "@angular/core";
import { RecurringActivity } from "../model/recurring-activity";
import { DynamicComponent } from "../../../core/config/dynamic-components/dynamic-component.decorator";
import { RelatedEntitiesComponent } from "../../../core/entity-details/related-entities/related-entities.component";
import { EntitySubrecordComponent } from "../../../core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component";
import { ColumnConfig } from "../../../core/common-components/entity-subrecord/entity-subrecord/entity-subrecord-config";
import { FormFieldConfig } from "../../../core/common-components/entity-form/entity-form/FormConfig";
import { FormFieldConfig } from "../../../core/common-components/entity-form/FormConfig";
import { EntitiesTableComponent } from "../../../core/common-components/entities-table/entities-table.component";

/**
* @deprecated configure a RelatedEntitiesComponent instead
Expand All @@ -14,7 +13,7 @@ import { FormFieldConfig } from "../../../core/common-components/entity-form/ent
selector: "app-activities-overview",
templateUrl:
"../../../core/entity-details/related-entities/related-entities.component.html",
imports: [EntitySubrecordComponent],
imports: [EntitiesTableComponent],
standalone: true,
})
export class ActivitiesOverviewComponent
Expand All @@ -33,12 +32,12 @@ export class ActivitiesOverviewComponent
relevantValue: "",
},
};
_columns: ColumnConfig[] = [
override _columns: FormFieldConfig[] = [
this.titleColumn,
"type",
"assignedTo",
"linkedGroups",
"excludedParticipants",
{ id: "type" },
{ id: "assignedTo" },
{ id: "linkedGroups" },
{ id: "excludedParticipants" },
];

async ngOnInit() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
></app-attendance-summary>
</div>

<app-entity-subrecord
<app-entities-table
[entityType]="entityCtr"
[records]="records"
[columns]="columns"
[customColumns]="columns"
clickMode="none"
(rowClick)="showDetails($event)"
[getBackgroundColor]="getBackgroundColor"
[editable]="false"
>
</app-entity-subrecord>
</app-entities-table>

<div class="margin-top-regular">
<mat-slide-toggle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { AttendanceService } from "../attendance.service";
import { formatPercent, NgIf } from "@angular/common";
import { ActivityAttendance } from "../model/activity-attendance";
import moment from "moment";
import { FormFieldConfig } from "../../../core/common-components/entity-form/entity-form/FormConfig";
import { FormFieldConfig } from "../../../core/common-components/entity-form/FormConfig";
import { DynamicComponent } from "../../../core/config/dynamic-components/dynamic-component.decorator";
import { MatProgressBarModule } from "@angular/material/progress-bar";
import { MatSlideToggleModule } from "@angular/material/slide-toggle";
import { MatTooltipModule } from "@angular/material/tooltip";
import { MatButtonModule } from "@angular/material/button";
import { EntitySubrecordComponent } from "../../../core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component";
import { AttendanceCalendarComponent } from "../attendance-calendar/attendance-calendar.component";
import { AttendanceSummaryComponent } from "../attendance-summary/attendance-summary.component";
import { MatDialog } from "@angular/material/dialog";
import { EntitiesTableComponent } from "../../../core/common-components/entities-table/entities-table.component";

@DynamicComponent("ActivityAttendanceSection")
@Component({
Expand All @@ -23,7 +23,7 @@ import { MatDialog } from "@angular/material/dialog";
imports: [
NgIf,
MatProgressBarModule,
EntitySubrecordComponent,
EntitiesTableComponent,
MatSlideToggleModule,
MatTooltipModule,
MatButtonModule,
Expand All @@ -38,6 +38,7 @@ export class ActivityAttendanceSectionComponent implements OnInit {

loading: boolean = true;
records: ActivityAttendance[] = [];
entityCtr = ActivityAttendance;
allRecords: ActivityAttendance[] = [];
combinedAttendance: ActivityAttendance;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { AlertService } from "../../../../core/alerts/alert.service";
import { AlertDisplay } from "../../../../core/alerts/alert-display";
import { FormsModule, NgModel } from "@angular/forms";
import { FilterService } from "../../../../core/filter/filter.service";
import { DataFilter } from "../../../../core/common-components/entity-subrecord/entity-subrecord/entity-subrecord-config";
import { FilterConfig } from "../../../../core/entity-list/EntityListConfig";
import { MatFormFieldModule } from "@angular/material/form-field";
import { MatInputModule } from "@angular/material/input";
Expand All @@ -27,6 +26,7 @@ import { MatProgressBarModule } from "@angular/material/progress-bar";
import { ActivityCardComponent } from "../../activity-card/activity-card.component";
import { MatButtonModule } from "@angular/material/button";
import { CurrentUserSubject } from "../../../../core/session/current-user-subject";
import { DataFilter } from "../../../../core/filter/filters/filters";

@Component({
selector: "app-roll-call-setup",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class AttendanceCalendarComponent implements OnChanges {
.receiveUpdates(EventNote)
.pipe(untilDestroyed(this))
.subscribe((newNotes) => {
this.records = applyUpdate(this.records, newNotes);
this.records = applyUpdate(this.records, newNotes, false);
this.selectDay(this.selectedDate?.toDate());
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,15 @@ <h1 mat-dialog-title>
</mat-form-field>
</div>

<app-entity-subrecord
<app-entities-table
[entityType]="EventNote"
[records]="entity.events"
[columns]="eventsColumns"
[customColumns]="eventsColumns"
clickMode="none"
(rowClick)="showEventDetails($event)"
[editable]="false"
>
</app-entity-subrecord>
</app-entities-table>

<app-attendance-calendar
[records]="entity.events"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActivityAttendance } from "../model/activity-attendance";
import { NoteDetailsComponent } from "../../notes/note-details/note-details.component";
import { Note } from "../../notes/model/note";
import { calculateAverageAttendance } from "../model/calculate-average-event-attendance";
import { FormFieldConfig } from "../../../core/common-components/entity-form/entity-form/FormConfig";
import { FormFieldConfig } from "../../../core/common-components/entity-form/FormConfig";
import { FormDialogService } from "../../../core/form-dialog/form-dialog.service";
import { EventNote } from "../model/event-note";
import { DialogCloseComponent } from "../../../core/common-components/dialog-close/dialog-close.component";
Expand All @@ -13,7 +13,7 @@ import { DatePipe, NgIf, PercentPipe } from "@angular/common";
import { FormsModule } from "@angular/forms";
import { MatInputModule } from "@angular/material/input";
import { AttendanceCalendarComponent } from "../attendance-calendar/attendance-calendar.component";
import { EntitySubrecordComponent } from "../../../core/common-components/entity-subrecord/entity-subrecord/entity-subrecord.component";
import { EntitiesTableComponent } from "../../../core/common-components/entities-table/entities-table.component";

@Component({
selector: "app-attendance-details",
Expand All @@ -28,14 +28,15 @@ import { EntitySubrecordComponent } from "../../../core/common-components/entity
DatePipe,
FormsModule,
MatInputModule,
EntitySubrecordComponent,
EntitiesTableComponent,
AttendanceCalendarComponent,
],
standalone: true,
})
export class AttendanceDetailsComponent {
@Input() entity: ActivityAttendance = new ActivityAttendance();
@Input() forChild: string;
EventNote = EventNote;

eventsColumns: FormFieldConfig[] = [
{ id: "date" },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Input } from "@angular/core";
import { ActivityAttendance } from "../model/activity-attendance";
import { FormFieldConfig } from "../../../core/common-components/entity-form/entity-form/FormConfig";
import { FormFieldConfig } from "../../../core/common-components/entity-form/FormConfig";
import { DatePipe, NgForOf, NgIf } from "@angular/common";
import { DynamicComponentDirective } from "../../../core/config/dynamic-components/dynamic-component.directive";

Expand Down
Loading

0 comments on commit 5ed1de9

Please sign in to comment.