Skip to content

Commit 3b6bde9

Browse files
timetable WIP, fix build
1 parent aaf9044 commit 3b6bde9

9 files changed

Lines changed: 52 additions & 43 deletions

File tree

school_data_hub_flutter/lib/features/timetable/presentation/widgets/lesson_cell/lesson_cell.dart

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -148,45 +148,48 @@ class LessonCell extends WatchingWidget {
148148
return Card(
149149
margin: const EdgeInsets.all(0),
150150
color: Colors.white,
151-
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(2)),
151+
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
152152
child: Padding(
153153
padding: const EdgeInsets.all(3.0),
154154
child: Column(
155155
mainAxisAlignment: MainAxisAlignment.start,
156156
mainAxisSize: MainAxisSize.min,
157157
children: [
158158
LessonCellTeacherInfo(lesson: lesson!),
159-
const Gap(2),
160-
Container(
161-
decoration: BoxDecoration(
162-
color:
163-
_parseColor(subjectColor)?.withValues(alpha: 0.7) ??
164-
Theme.of(
165-
context,
166-
).colorScheme.primaryContainer.withValues(alpha: 0.7),
167-
borderRadius: BorderRadius.circular(4),
168-
border: Border.all(
159+
const Gap(4),
160+
SizedBox(
161+
height: 20,
162+
child: Container(
163+
decoration: BoxDecoration(
169164
color:
170-
_parseColor(subjectColor) ??
171-
Theme.of(context).colorScheme.primary,
172-
width: 1,
165+
_parseColor(subjectColor)?.withValues(alpha: 0.7) ??
166+
Theme.of(
167+
context,
168+
).colorScheme.primaryContainer.withValues(alpha: 0.7),
169+
borderRadius: BorderRadius.circular(4),
170+
border: Border.all(
171+
color:
172+
_parseColor(subjectColor) ??
173+
Theme.of(context).colorScheme.primary,
174+
width: 1,
175+
),
173176
),
174-
),
175-
child: Row(
176-
mainAxisAlignment: MainAxisAlignment.center,
177-
mainAxisSize: MainAxisSize.max,
178-
children: [
179-
Text(
180-
subjectName,
181-
style: const TextStyle(
182-
fontSize: 11,
183-
fontWeight: FontWeight.bold,
177+
child: Row(
178+
mainAxisAlignment: MainAxisAlignment.center,
179+
mainAxisSize: MainAxisSize.max,
180+
children: [
181+
Text(
182+
subjectName,
183+
style: const TextStyle(
184+
fontSize: 11,
185+
fontWeight: FontWeight.bold,
186+
),
187+
maxLines: 1,
188+
overflow: TextOverflow.ellipsis,
189+
textAlign: TextAlign.center,
184190
),
185-
maxLines: 1,
186-
overflow: TextOverflow.ellipsis,
187-
textAlign: TextAlign.center,
188-
),
189-
],
191+
],
192+
),
190193
),
191194
),
192195
const Gap(1),

school_data_hub_server/lib/src/_features/books/endpoints/library_books/library_books_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:school_data_hub_server/src/_features/books/endpoints/books/book_tagging_helper.dart';
22
import 'package:school_data_hub_server/src/generated/protocol.dart';
3-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
3+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
44
import 'package:serverpod/serverpod.dart';
55

66
class LibraryBooksEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/books/endpoints/pupil_book_lending_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:school_data_hub_server/src/generated/protocol.dart';
22
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
3-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
3+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
44
import 'package:serverpod/serverpod.dart';
55

66
class PupilBookLendingEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/learning/competence/endpoints/competence_check_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:school_data_hub_server/src/generated/protocol.dart';
22
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
3-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
3+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
44
import 'package:serverpod/serverpod.dart';
55

66
class CompetenceCheckEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/learning/competence/endpoints/competence_goal_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:school_data_hub_server/src/generated/protocol.dart';
22
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
3-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
3+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
44
import 'package:serverpod/serverpod.dart';
55

66
class CompetenceGoalEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/learning_support/endpoints/learning_support_plan_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:school_data_hub_server/src/generated/protocol.dart';
22
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
3-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
3+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
44
import 'package:serverpod/serverpod.dart';
55

66
class LearningSupportPlanEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/learning_support/endpoints/pre_school_medical_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:school_data_hub_server/src/generated/protocol.dart';
22
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
3-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
3+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
44
import 'package:serverpod/serverpod.dart';
55

66
class PreSchoolMedicalEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/pupil/endpoints/pupil_endpoint.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:logging/logging.dart';
22
import 'package:school_data_hub_server/src/generated/protocol.dart';
33
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
4-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
4+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
55
import 'package:serverpod/serverpod.dart';
66

77
class PupilEndpoint extends Endpoint {

school_data_hub_server/lib/src/_features/pupil/endpoints/pupil_update_endpoint.dart

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:logging/logging.dart';
2+
import 'package:school_data_hub_server/src/_features/pupil/schemas/pupil_schemas.dart';
23
import 'package:school_data_hub_server/src/generated/protocol.dart';
34
import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
4-
import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
55
import 'package:serverpod/serverpod.dart';
66

77
final _log = Logger('PupilUpdateEndpoint');
@@ -33,7 +33,8 @@ class PupilUpdateEndpoint extends Endpoint {
3333
pupil.id!,
3434
include: PupilSchemas.allInclude,
3535
);
36-
session.messages.postMessage('hub_events_stream', updatedPupilWithRelation!);
36+
session.messages
37+
.postMessage('hub_events_stream', updatedPupilWithRelation!);
3738
return updatedPupilWithRelation;
3839
}
3940

@@ -51,7 +52,8 @@ class PupilUpdateEndpoint extends Endpoint {
5152
pupil.id!,
5253
include: PupilSchemas.allInclude,
5354
);
54-
session.messages.postMessage('hub_events_stream', updatedPupilWithRelation!);
55+
session.messages
56+
.postMessage('hub_events_stream', updatedPupilWithRelation!);
5557
return updatedPupilWithRelation;
5658
}
5759

@@ -69,7 +71,8 @@ class PupilUpdateEndpoint extends Endpoint {
6971
pupil.id!,
7072
include: PupilSchemas.allInclude,
7173
);
72-
session.messages.postMessage('hub_events_stream', updatedPupilWithRelation!);
74+
session.messages
75+
.postMessage('hub_events_stream', updatedPupilWithRelation!);
7376
return updatedPupilWithRelation;
7477
}
7578

@@ -377,7 +380,8 @@ class PupilUpdateEndpoint extends Endpoint {
377380
pupil.id!,
378381
include: PupilSchemas.allInclude,
379382
);
380-
session.messages.postMessage('hub_events_stream', updatedPupilWithRelation!);
383+
session.messages
384+
.postMessage('hub_events_stream', updatedPupilWithRelation!);
381385
return updatedPupilWithRelation;
382386
}
383387

@@ -424,7 +428,8 @@ class PupilUpdateEndpoint extends Endpoint {
424428
pupil.id!,
425429
include: PupilSchemas.allInclude,
426430
);
427-
session.messages.postMessage('hub_events_stream', updatedPupilWithRelation!);
431+
session.messages
432+
.postMessage('hub_events_stream', updatedPupilWithRelation!);
428433
return updatedPupilWithRelation;
429434
}
430435

@@ -442,7 +447,8 @@ class PupilUpdateEndpoint extends Endpoint {
442447
pupil.id!,
443448
include: PupilSchemas.allInclude,
444449
);
445-
session.messages.postMessage('hub_events_stream', updatedPupilWithRelation!);
450+
session.messages
451+
.postMessage('hub_events_stream', updatedPupilWithRelation!);
446452
return updatedPupilWithRelation;
447453
}
448454
}

0 commit comments

Comments
 (0)