浏览代码

desktop: Fixed digital forms dashboard when duplicate variable codes occur

Kenric Nugteren 2 月之前
父节点
当前提交
1d4f4b56a9
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      prs.desktop/Dashboards/Common/DigitalFormsDashboard.xaml.cs

+ 5 - 4
prs.desktop/Dashboards/Common/DigitalFormsDashboard.xaml.cs

@@ -1425,13 +1425,14 @@ public partial class DigitalFormsDashboard : UserControl,
             {
                 var code = variable.Code.Replace("/", " ");
                 Grid.QuestionCodes[code] = Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(code.ToLower());
-                try
+
+                if (cData.HasColumn(code))
                 {
-                    cData.AddColumn<string>(code);
+                    MessageWindow.ShowError($"Error: duplicate variable code {code}", $"Error: duplicate variable code {code}", title: "Duplicate code");
                 }
-                catch (DuplicateNameException e)
+                else
                 {
-                    MessageWindow.ShowError($"Error: duplicate variable code {code}", e, title: "Duplicate code");
+                    cData.AddColumn<string>(code);
                 }
             }
         }