Crossed out cancelled hours, implemented file uploading

lib/screen/pages/files/fileUpload.dart

@@ -0,0 +1,72 @@
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import 'package:marianum_mobile/api/marianumcloud/webdav/webdavApi.dart';
+
+class FileUpload extends StatefulWidget {
+  final String localPath;
+  final String remotePath;
+  const FileUpload({Key? key, required this.localPath, required this.remotePath}) : super(key: key);
+
+  @override
+  State<FileUpload> createState() => _FileUploadState();
+}
+
+class _FileUploadState extends State<FileUpload> {
+  CancelableOperation? cancelableOperation;
+  late File localFile;
+
+  @override
+  void initState() {
+    super.initState();
+    localFile = File(widget.localPath);
+  }
+
+  bool isRunning() {
+    return cancelableOperation != null && !(cancelableOperation!.isCompleted);
+  }
+
+  bool isComplete() {
+    return cancelableOperation?.isCompleted ?? false;
+  }
+
+  void start() async {
+    cancelableOperation = CancelableOperation.fromFuture(
+      (await WebdavApi.webdav).upload(localFile.readAsBytesSync(), widget.remotePath).then((value) {
+        log("Upload done!");
+      }),
+      onCancel: () => log("Upload cancelled"),
+    );
+
+    cancelableOperation!.then((e) {
+      setState(() {});
+    });
+    setState(() {});
+  }
+
+  void stop() {
+    cancelableOperation?.cancel();
+    setState(() {});
+    Navigator.of(context).pop();
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> actions = List<Widget>.empty(growable: true);
+    if(!isRunning() && !isComplete()) actions.add(TextButton(onPressed: start, child: const Text("Upload starten")));
+    if(isRunning()) actions.add(TextButton(onPressed: stop, child: const Text("Upload Abbrechen")));
+    if(isComplete()) actions.add(TextButton(onPressed: Navigator.of(context).pop, child: const Text("Fertig")));
+
+    return AlertDialog(
+      title: const Text("Hochladen"),
+      content: Center(
+        child: isRunning() ? const CircularProgressIndicator() : const Text("Datei hochladen"),
+      ),
+      actions: actions,
+      icon: const Icon(Icons.upload),
+    );
+  }
+}

lib/screen/pages/files/files.dart

@@ -5,9 +5,9 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:loader_overlay/loader_overlay.dart';
 import 'package:marianum_mobile/api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart';
+import 'package:marianum_mobile/screen/pages/files/fileUpload.dart';
 import 'package:marianum_mobile/widget/errorView.dart';
-import 'package:nextcloud/nextcloud.dart';
+import 'package:persistent_bottom_nav_bar/persistent_tab_view.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 import '../../../api/marianumcloud/webdav/queries/listFiles/listFilesCache.dart';
 import '../../../api/marianumcloud/webdav/queries/listFiles/listFilesResponse.dart';
@@ -77,7 +77,10 @@ class _FilesState extends State<Files> {
   @override
   void initState() {
     super.initState();
+    _query();
+  }
 
+  void _query() {
     ListFilesCache(
         path: widget.path.isEmpty ? "/" : widget.path.join("/"),
         onUpdate: (ListFilesResponse d) => {
@@ -192,6 +195,11 @@ class _FilesState extends State<Files> {
         child: const Icon(Icons.upload),
       ),
       body: data == null ? const Center(child: CircularProgressIndicator()) : data!.files.isEmpty ? const ErrorView(icon: Icons.folder_off_rounded, text: "Der Ordner ist leer") : LoaderOverlay(
+        child: RefreshIndicator(
+          onRefresh: () {
+            _query();
+            return Future.delayed(const Duration(seconds: 3));
+          },
           child: ListView.builder(
             itemCount: files.length,
             itemBuilder: (context, index) {
@@ -200,6 +208,7 @@ class _FilesState extends State<Files> {
             },
           ),
         )
+      )
     );
   }
 
@@ -209,26 +218,10 @@ class _FilesState extends State<Files> {
       return;
     }
 
-    SharedPreferences preferences = await SharedPreferences.getInstance();
+    context.loaderOverlay.show();
-    WebDavClient client = NextcloudClient("https://cloud.marianum-fulda.de/", username: preferences.getString("username"), password: preferences.getString("password"), loginName: preferences.getString("username")).webdav;
-
-    log("UPLOAD STARTING: $path");
     File file = File(path);
+    var remotePath = "${widget.path.join("/")}/${file.path.split(Platform.pathSeparator).last}";
+    PersistentNavBarNavigator.pushNewScreen(context, screen: FileUpload(localPath: path, remotePath: remotePath), withNavBar: false);
 
-    showDialog(
-      context: context,
-      builder: (context) {
-        return SimpleDialog(
-          children: [
-            Image.memory(file.readAsBytesSync()),
-          ],
-        );
-      },
-    );
-
-    client.upload(file.readAsBytesSync(), "/${file.path.split(Platform.pathSeparator).last}").then((value) {
-      log("UPLOADED ${value.statusCode}");
-      context.loaderOverlay.hide();
-    });
   }
 }

lib/screen/pages/timetable/CrossPainter.dart

@@ -0,0 +1,17 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class CrossPainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..color = Colors.red.withAlpha(200)
+      ..strokeWidth = 2.0;
+
+    canvas.drawLine(Offset(0, 0), Offset(size.width, size.height), paint);
+    canvas.drawLine(Offset(size.width, 0), Offset(0, size.height), paint);
+  }
+
+  @override
+  bool shouldRepaint(CrossPainter oldDelegate) => false;
+}

lib/screen/pages/timetable/appointmenetComponent.dart

@@ -1,18 +1,20 @@
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:marianum_mobile/api/webuntis/queries/getTimetable/getTimetableResponse.dart';
+import 'package:marianum_mobile/screen/pages/timetable/CrossPainter.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 
 class AppointmentComponent extends StatefulWidget {
   final CalendarAppointmentDetails details;
-  const AppointmentComponent({Key? key, required this.details}) : super(key: key);
+  final bool crossedOut;
+  const AppointmentComponent({Key? key, required this.details, this.crossedOut = false}) : super(key: key);
 
   @override
   State<AppointmentComponent> createState() => _AppointmentComponentState();
 }
 
 class _AppointmentComponentState extends State<AppointmentComponent> {
-
   @override
   Widget build(BuildContext context) {
     final Appointment meeting = widget.details.appointments.first;
@@ -22,7 +24,9 @@ class _AppointmentComponentState extends State<AppointmentComponent> {
     final double infoHeight = appointmentHeight - (headerHeight + footerHeight);
     if (infoHeight < 0) headerHeight += infoHeight;
 
-    return Column(
+    return Stack(
+      children: [
+        Column(
           children: [
             Container(
               padding: const EdgeInsets.all(3),
@@ -32,7 +36,8 @@ class _AppointmentComponentState extends State<AppointmentComponent> {
                 shape: BoxShape.rectangle,
                 borderRadius: const BorderRadius.only(
                   topLeft: Radius.circular(5),
-                topRight: Radius.circular(5)),
+                  topRight: Radius.circular(5),
+                ),
                 color: meeting.color,
               ),
               child: SingleChildScrollView(
@@ -67,7 +72,8 @@ class _AppointmentComponentState extends State<AppointmentComponent> {
                       ),
                     )
                   ],
-              )),
+                ),
+              ),
             ),
             Visibility(
               visible: meeting.notes != null && infoHeight > 10,
@@ -93,7 +99,8 @@ class _AppointmentComponentState extends State<AppointmentComponent> {
                         ),
                       )
                     ],
-                )),
+                  ),
+                ),
               ),
             ),
             Container(
@@ -102,11 +109,22 @@ class _AppointmentComponentState extends State<AppointmentComponent> {
                 shape: BoxShape.rectangle,
                 borderRadius: const BorderRadius.only(
                   bottomLeft: Radius.circular(5),
-                bottomRight: Radius.circular(5)),
+                  bottomRight: Radius.circular(5),
+                ),
                 color: meeting.color,
               ),
             ),
           ],
+        ),
+        Visibility(
+          visible: (meeting.id as GetTimetableResponseObject).code == "cancelled",
+          child: Positioned.fill(
+            child: CustomPaint(
+              painter: CrossPainter(),
+            ),
+          ),
+        ),
+      ],
     );
   }
 }

lib/screen/pages/timetable/timetable.dart

@@ -115,7 +115,10 @@ class _TimetableState extends State<Timetable> {
               ),
 
               timeRegionBuilder: (BuildContext context, TimeRegionDetails timeRegionDetails) => TimeRegionComponent(details: timeRegionDetails),
-              appointmentBuilder: (BuildContext context, CalendarAppointmentDetails details) => AppointmentComponent(details: details),
+              appointmentBuilder: (BuildContext context, CalendarAppointmentDetails details) => AppointmentComponent(
+                  details: details,
+                  crossedOut: value.getTimetableResponse.result.where((element) => element.id == details.appointments.first.id).firstOrNull?.code == "cancelled"
+              ),
 
               headerHeight: 0,
               selectionDecoration: const BoxDecoration(),

pubspec.yaml

@@ -77,6 +77,7 @@ dependencies:
   crypto: ^3.0.3
   package_info: ^2.0.2
   syncfusion_flutter_calendar: ^21.2.4
+  async: ^2.11.0
 
 dev_dependencies:
   flutter_test: