From 40c4045f865204f87f95896e62de47cf7cca879b Mon Sep 17 00:00:00 2001 From: Matthew <119624750+casualWaist@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:17:48 -0400 Subject: [PATCH] fixes for exiting IT and editing original message --- .../controllers/it_controller.dart | 23 ++++++++++++++----- lib/pangea/choreographer/widgets/it_bar.dart | 7 +++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/pangea/choreographer/controllers/it_controller.dart b/lib/pangea/choreographer/controllers/it_controller.dart index 6d5f8e347..91899a71a 100644 --- a/lib/pangea/choreographer/controllers/it_controller.dart +++ b/lib/pangea/choreographer/controllers/it_controller.dart @@ -61,11 +61,9 @@ class ITController { } void closeIT() { - //if they close it before choosing anything, just put their text back + //if they close it before completing, just put their text back //PTODO - explore using last itStep - if (choreographer.currentText.isEmpty) { - choreographer.textController.text = sourceText ?? ""; - } + choreographer.textController.text = sourceText ?? ""; clear(); } @@ -217,8 +215,20 @@ class ITController { Future onEditSourceTextSubmit(String newSourceText) async { try { - sourceText = newSourceText; + + _isOpen = true; _isEditingSourceText = false; + _itStartData = ITStartData(newSourceText, choreographer.l1LangCode); + completedITSteps = []; + currentITStep = null; + nextITStep = null; + goldRouteTracker = GoldRouteTracker.defaultTracker; + payLoadIds = []; + + _setSourceText(); + getTranslationData(false); + + /*sourceText = newSourceText; final String currentText = choreographer.currentText; choreographer.startLoading(); @@ -241,7 +251,7 @@ class ITController { storedGoldContinuances: goldRouteTracker.continuances, ); - _addPayloadId(responses[1]); + _addPayloadId(responses[1]);*/ } catch (err, stack) { debugger(when: kDebugMode); if (err is! http.Response) { @@ -252,6 +262,7 @@ class ITController { ); } finally { choreographer.stopLoading(); + choreographer.textController.text = ""; } } diff --git a/lib/pangea/choreographer/widgets/it_bar.dart b/lib/pangea/choreographer/widgets/it_bar.dart index 4e26cba58..013c7238b 100644 --- a/lib/pangea/choreographer/widgets/it_bar.dart +++ b/lib/pangea/choreographer/widgets/it_bar.dart @@ -184,7 +184,12 @@ class OriginalText extends StatelessWidget { ), ), ), - if (!controller.isEditingSourceText && controller.sourceText != null) + if ( + !controller.isEditingSourceText + && controller.sourceText != null + && controller.completedITSteps.length + < controller.goldRouteTracker.continuances.length + ) IconButton( onPressed: () => controller.setIsEditingSourceText(true), icon: const Icon(Icons.edit_outlined),