From 40a44848a83f1f052e97971554165354e194a8ba Mon Sep 17 00:00:00 2001 From: mr Date: Mon, 23 Sep 2024 16:59:21 +0200 Subject: [PATCH] Change for demo --- lib/core/services/api_service.dart | 2 ++ lib/core/services/router.dart | 2 +- lib/pages/workflow.dart | 20 +++++++++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/core/services/api_service.dart b/lib/core/services/api_service.dart index 8d88e2f..3cabe4c 100644 --- a/lib/core/services/api_service.dart +++ b/lib/core/services/api_service.dart @@ -78,6 +78,8 @@ class APIService { _dio.options.headers["authorization"] = auth; _dio.interceptors.clear(); var response = await _request(url, method, body, options); + print(response.data); + print(url); if (response.statusCode != null && response.statusCode! < 400) { if (method == "delete") { cache.remove(url); return APIResponse(); } APIResponse resp = APIResponse().deserialize(response.data); diff --git a/lib/core/services/router.dart b/lib/core/services/router.dart index e4e4eee..2ab42ea 100644 --- a/lib/core/services/router.dart +++ b/lib/core/services/router.dart @@ -68,7 +68,7 @@ class AppRouter { description: "Manage & monitor your datacenter.", help: "not implemented for now", factory: DatacenterFactory()), RouterItem(icon: Icons.public_outlined, label: "localisations", route: "map", factory: MapFactory()), - RouterItem(icon: Icons.share_rounded, label: "shared spaces", route: "shared", factory: SharedFactory()), + RouterItem(icon: Icons.share_rounded, label: "collaborative area", route: "shared", factory: SharedFactory()), workflowIDItem, catalogItem, ]; diff --git a/lib/pages/workflow.dart b/lib/pages/workflow.dart index b149e1b..3e8d906 100644 --- a/lib/pages/workflow.dart +++ b/lib/pages/workflow.dart @@ -17,8 +17,7 @@ import 'package:oc_front/widgets/forms/scheduler_forms.dart'; import 'package:oc_front/widgets/items/item_row.dart'; import 'package:oc_front/widgets/inputs/shallow_dropdown_input.dart'; -Dashboard dash = Dashboard( - name: "workflow_${DateTime.now().toString().replaceAll(" ", "_").substring(0, DateTime.now().toString().length - 7)}"); +Dashboard dash = Dashboard(name: ""); class WorkflowFactory implements AbstractFactory { static GlobalKey key = GlobalKey(); @override bool searchFill() { return false; } @@ -66,17 +65,23 @@ final WorflowService _service = WorflowService(); Future loadDash(String selected) async { dash.shouldSave = false; + dash.name = ""; + var name = ""; if (selected.split("~").length > 1) { - dash.name = selected.split("~")[1]; + name = selected.split("~")[1]; dash.id = selected.split("~")[0]; } else { - dash.name = selected; + name = selected; } await _service.get(context, dash.id ?? "").then((value) { if (value.data != null) { dash.clear(); dash.deserialize(value.data!.toDashboard()); - Future.delayed(const Duration(seconds: 1), () => dash.shouldSave = true); + Future.delayed(const Duration(seconds: 1), () { + dash.name = name; + dash.shouldSave = true; + dash.selectedMenuKey.currentState?.setState(() { }); + }); } }); } @@ -203,6 +208,9 @@ final WorflowService _service = WorflowService(); dash.notifyListeners(); WorkspaceLocal.init(context, true); dash.isOpened = true; + Future.delayed(const Duration(seconds: 1), () { + dash.load!("${dash.id}~${dash.name}"); + }); } ), maptoDropdown: (e) => DropdownMenuItem( @@ -230,8 +238,6 @@ final WorflowService _service = WorflowService(); dash.infoItemWidget = getForms; dash.infoWidget = getDashInfoForms; var quart = MediaQuery.of(context).size.width / 6; - dash.defaultName = "workflow_${DateTime.now().toString().replaceAll(" ", "_" - ).substring(0, DateTime.now().toString().length - 7)}"; return FlowChart( onDashboardAlertOpened: onDashboardAlertOpened, dashboard: dash,