diff --git a/src/export.py b/src/export.py index 75bec97..ed28df7 100644 --- a/src/export.py +++ b/src/export.py @@ -153,7 +153,6 @@ def export_translation(doc, translation): explanationList = doc.createElement("explanationList") for explanation in translation.explanationList: - console.log(explanation) el = doc.createElement("explanation") el.textContent = explanation explanationList.appendChild(el) diff --git a/src/message/translation_edit.py b/src/message/translation_edit.py index 51a4dae..daa07bd 100644 --- a/src/message/translation_edit.py +++ b/src/message/translation_edit.py @@ -6,26 +6,27 @@ from model.translation import Translation from model.sense import Sense - + class EditTranslation(DataChgClickMessage): def update_model(self, model): self.translation = self.get_arg(0, Translation) self.old_cluster_idx = self.get_arg(1, int) - + self.translation.translation = document.getElementById("etv").value - self.translation.explanation = document.getElementById("ete").value - +# This could be dangerous if generic_list_getter is getting data from any other list as well. + self.translation.explanationList = common_accessors.generic_list_getter() + # common_accessors.label_list_getter() self.translation.tags = common_accessors.label_list_getter() - + # check if empty, remove! if self.translation.is_empty(): model.entry.remove_translation(self.translation) return - + new_cluster_idx = int(document.getElementById("cluster-num").value) - 1 self.handle_cluster_change(new_cluster_idx, model) - + @staticmethod def get_translation_location(entry, translation): def find_in_clusters(parent): @@ -34,7 +35,7 @@ class EditTranslation(DataChgClickMessage): if search_translation == translation: return (ci, ti), (parent, cluster) return None - + for sense in entry.senses: res = find_in_clusters(sense) if res is not None: @@ -43,21 +44,21 @@ class EditTranslation(DataChgClickMessage): res = find_in_clusters(example) if res is not None: return res - + window.console.log("should not be here...") - - + + def handle_cluster_change(self, new_cluster_idx, model): if self.old_cluster_idx == new_cluster_idx: return - + (cidx, tidx), (parent, cluster) = EditTranslation.get_translation_location(model.entry, self.translation) self.do_cluster_change(parent, cluster, cidx, tidx, new_cluster_idx) - + def do_cluster_change(self, sense_or_example, cluster, cidx, tidx, new_cluster_idx): # remove the translation from the old cluster cluster.splice(tidx, 1) - + # we maybe are creating a new cluster, handle that if len(sense_or_example.translations) == new_cluster_idx: sense_or_example.translations.append([self.translation]) @@ -66,12 +67,12 @@ class EditTranslation(DataChgClickMessage): sense_or_example.translations[new_cluster_idx].append(self.translation) else: raise ValueError("Bad new cluster idx :(") - + # we still hold cluster reference, check if empty and remove if necessary # we cant do this earlier since indexes change and yeah, fun stuff if len(cluster) == 0: sense_or_example.translations.splice(cidx, 1) - + class MoveRight(DataChgClickMessage): def update_model(self, model): @@ -80,8 +81,8 @@ class MoveRight(DataChgClickMessage): if idx != len(cluster) - 1: cluster[idx], cluster[idx + 1] = cluster[idx + 1], cluster[idx] model.translation = None - - + + class MoveLeft(DataChgClickMessage): def update_model(self, model): translation = self.get_arg(0, Translation) @@ -89,8 +90,8 @@ class MoveLeft(DataChgClickMessage): if idx != 0 and len(cluster) > 1: cluster[idx], cluster[idx - 1] = cluster[idx - 1], cluster[idx] model.translation = None - - + + class BinTranslation(DataChgClickMessage): def update_model(self, model): translation = self.get_arg(0, Translation) @@ -101,7 +102,7 @@ class BinTranslation(DataChgClickMessage): else: cluster.splice(tidx, 1) model.translation = None - + class AddTranslation(EditTranslation): def handle_cluster_change(self, new_cluster_idx, _): @@ -110,4 +111,4 @@ class AddTranslation(EditTranslation): # we make a dummy cluster, cluster_idx and translation_idx # we give a correct new_cluster_idx self.do_cluster_change(self.get_arg(2), [None, None], None, None, new_cluster_idx) - + diff --git a/src/view/modals.py b/src/view/modals.py index 0b761b4..d9ca6e2 100644 --- a/src/view/modals.py +++ b/src/view/modals.py @@ -19,10 +19,9 @@ def edit_translation(translation, parent, cluster_idx, num_clusters, cls): # first line: transalation itself content.extend([ - split_line2("Prevedek:", - h("textarea#etv", {"props": {"value": translation.translation}}, "")), - split_line2("Razlaga:", - h("textarea#ete", {"props": {"value": translation.explanation}}, ""))]) + split_line2("Prevedek:", h("textarea#etv", {"props": {"value": translation.translation}}, ""))]) + + content.extend(generic_list_editor("Razlage:", lambda: translation.explanationList)) # cluster number options = [h("option", {"props": {"selected": idx == cluster_idx}}, str(idx + 1)) for idx in range(num_clusters + 1)]