Fixed bugs on msetup

Author: yves-amevoin

.mock/disease_mock.xlsb

@@ -98,6 +98,6 @@ update_master_setup <- function(tag = "mock") {
 }
 
 # copy the mock file for development
-update_designer(tag = "mock")
-update_setup(tag = "mock")
+# update_designer(tag = "mock")
+# update_setup(tag = "mock")
 update_master_setup(tag = "mock")

.mock/~$disease_mock.xlsb

@@ -24,7 +24,7 @@ End Type
 
 Private this As TCustomTable
 Private Const CLASSNAME As String = "ICustomTable"
-Private Const NBROWSADD As Long = 5 'Number of Rows to add when resizing
+Private Const NBROWSADD As Long = 10 'Number of Rows to add when resizing
 Private Const TABTRANSLATIONS As String = "Tab_Translations"
 Private Const TABEXPORT As String = "Tab_Export"
 

automate/codes/update_files.R

@@ -265,13 +265,13 @@ Private Sub Add(ByVal disName As String, _
                           message:=trads.TranslatedValue("errLang")
 
     'Add the listObject for the disease
-
-    .Cells(4, 2).Value = trads.TranslatedValue("varName")
-    .Cells(4, 3).Value = trads.TranslatedValue("varLabel")
-    .Cells(4, 4).Value = trads.TranslatedValue("varChoice")
-    .Cells(4, 5).Value = trads.TranslatedValue("choiceVal")
-    .Cells(4, 6).Value = trads.TranslatedValue("varStatus")
-    '.Cells(4, 7).Value = trads.TranslatedValue("varVis")
+    .Cells(4, 2).Value = trads.TranslatedValue("varOrder")
+    .Cells(4, 3).Value = trads.TranslatedValue("varSection")
+    .Cells(4, 4).Value = trads.TranslatedValue("varName")
+    .Cells(4, 5).Value = trads.TranslatedValue("varLabel")
+    .Cells(4, 6).Value = trads.TranslatedValue("varChoice")
+    .Cells(4, 7).Value = trads.TranslatedValue("choiceVal")
+    .Cells(4, 8).Value = trads.TranslatedValue("varStatus")
 
     'Validation for variable Name
     With .Cells(5, 2).Validation
@@ -321,7 +321,7 @@ Private Sub Add(ByVal disName As String, _
     '                       alertType:= "error", _
     '                       message:=selectValue
     ' 'Creating the listObject
-    Set loRng = .Range(.Cells(4, 2), .Cells(5, 6))
+    Set loRng = .Range(.Cells(4, 2), .Cells(15, 8))
     .ListObjects.Add(xlSrcRange, loRng, , xlYes).Name = TABTAG & nbDis
   End With
 
@@ -494,11 +494,12 @@ Private Sub ExportDisease(ByVal disName As String)
   FormatSheet outwb.Worksheets("Dictionary")
   Set sh = outwb.Worksheets("Dictionary")
 
-  sh.Cells(1, 1).Value = "Variable Name"
-  sh.Cells(1, 2).Value = "Main Label"
-  sh.Cells(1, 3).Value = "Control"
-  sh.Cells(1, 4).Value = "Status"
-  sh.Cells(1, 5).Value = "Visibility"
+  sh.Cells(1, 1).Value = "Variable Order"
+  sh.Cells(1, 2).Value = "Variable Section"
+  sh.Cells(1, 3).Value = "Variable Name"
+  sh.Cells(1, 4).Value = "Main Label"
+  sh.Cells(1, 5).Value = "Control"
+  sh.Cells(1, 6).Value = "Status"
 
   Set cellRng = disWksh.Cells(5, 2)
   counter = 2
@@ -508,17 +509,18 @@ Private Sub ExportDisease(ByVal disName As String)
     sh.Cells(counter, 1).Value = cellRng.Value
     sh.Cells(counter, 2).Value = cellRng.Offset(, 1).Value
     sh.Cells(counter, 3).Value = cellRng.Offset(, 2).Value
-    'The third offset is for choices values separated with a |
+    sh.Cells(counter, 4).Value = cellRng.Offset(, 3).Value
+    sh.Cells(counter, 5).Value = cellRng.Offset(, 4).Value
+        'The third offset is for choices values separated with a |
     'Status and visibility (status has only two values: Core, non core)
     'visibility has only three values (always show, optional show, optional hidden)
-    sh.Cells(counter, 4).Value = cellRng.Offset(, 4).Value
-    sh.Cells(counter, 5).Value = cellRng.Offset(, 5).Value
+    sh.Cells(counter, 6).Value = cellRng.Offset(, 6).Value
 
     'The third column is the control column in the dictionary worksheet (choice Name)
-    choiName = sh.Cells(counter, 3).Value
+    choiName = sh.Cells(counter, 5).Value
     listCols.Clear
     'Those are the translated values of the choices
-    listCols.Items = Split(cellRng.Offset(, 4).Value, DEFAULTCHOICESEPARATOR)
+    listCols.Items = Split(cellRng.Offset(, 5).Value, DEFAULTCHOICESEPARATOR)
     choiObj.AddChoice choiName, listCols
 
     'Loop over
@@ -835,22 +837,22 @@ Private Sub ExportForMigration()
     Set Lo = disWksh.ListObjects(1)
     Set LoRng = Lo.Range
 
-    With sh
-      lastColumn = .Cells(3, .Columns.Count).End(xlToLeft).Column + 2
-      'Remove 1 when adding to take in account the whole plage of the range
-      Set outLoRng = .Range(.Cells(3, lastColumn),  _ 
-                        .Cells(2 + LoRng.Rows.Count, lastColumn + LoRng.Columns.Count - 1))
-      outLoRng.Value = LoRng.Value
-      .ListObjects.Add(xlSrcRange, outLoRng, , xlYes).Name = Lo.Name
-
-      'Add the language, the disease tag
-      .Cells(2, lastColumn).Value = disWksh.Name
-      .Cells(2, lastColumn + 1).Value = disWksh.Cells(2, 2).Value
-      .Cells(2, lastColumn + 2).Value = disWksh.Cells(2, 3).Value
-
-      FormatRange .Range(.Cells(2, lastColumn), .Cells(2, lastColumn + 2)), _ 
-                  fontColor:=RGB(178, 190, 181)
-    End With
+    ' With sh
+    '   lastColumn = .Cells(3, .Columns.Count).End(xlToLeft).Column + 2
+    '   'Remove 1 when adding to take in account the whole plage of the range
+    '   Set outLoRng = .Range(.Cells(3, lastColumn),  _ 
+    '                     .Cells(2 + LoRng.Rows.Count, lastColumn + LoRng.Columns.Count - 1))
+    '   outLoRng.Value = LoRng.Value
+    '   .ListObjects.Add(xlSrcRange, outLoRng, , xlYes).Name = Lo.Name
+
+    '   'Add the language, the disease tag
+    '   .Cells(2, lastColumn).Value = disWksh.Name
+    '   .Cells(2, lastColumn + 1).Value = disWksh.Cells(2, 2).Value
+    '   .Cells(2, lastColumn + 2).Value = disWksh.Cells(2, 3).Value
+
+    '   FormatRange .Range(.Cells(2, lastColumn), .Cells(2, lastColumn + 2)), _ 
+    '               fontColor:=RGB(178, 190, 181)
+    ' End With
   Next
 
   'Save the workbook to the corresponding filePath
@@ -864,7 +866,6 @@ Private Sub ExportForMigration()
   ConflictResolution:=Excel.XlSaveConflictResolution.xlLocalSessionChanges
   Application.DisplayAlerts = prevAlert
   outwb.Close saveChanges:=False
-  
 End Sub
 
 

ribbons/ribbon_icons/Thumbs.db

@@ -58,7 +58,7 @@ Public Sub checkUpdateStatus(ByVal sh As Worksheet, ByVal Target As Range)
 
     If sh.Name = "Variables" Then
         Set Lo = sh.ListObjects(1)
-        If Not (Intersect(Target, Lo.ListColumns(3).Range) Is Nothing) Then
+        If (Target.Column =  Lo.ListColumns(3).Column) Then
             'Test if Default choices has been modified
             Set pass = Passwords.Create(wb.Worksheets(PASSSHEETNAME))
             Set ribSh = wb.Worksheets(RIBBONTRADSHEET)
@@ -131,7 +131,7 @@ Public Sub UpdateDiseaseSheet(ByVal disSh As Worksheet, ByVal Target As Range)
     If Not (Intersect(Target, disSh.Cells(2, 2)) Is Nothing) Then Set tradRng = Lo.DataBodyRange
 
     'Update Variable label, status, choice and Default choice
-    If Not (Intersect(Target, Lo.ListColumns(1).Range) Is Nothing) Then Set tradRng = Target
+    If Not (Intersect(Target, Lo.ListColumns(3).Range) Is Nothing) Then Set tradRng = Target
 
 
     'Update translation elements
@@ -158,7 +158,7 @@ Public Sub UpdateDiseaseSheet(ByVal disSh As Worksheet, ByVal Target As Range)
     End If
 
     'Update Categories
-    If Not (Intersect(Target, Lo.ListColumns(3).Range) Is Nothing) Then
+    If Not (Intersect(Target, Lo.ListColumns(5).Range) Is Nothing) Then
         For counter = 1 To Target.Rows.Count
             choiValue = Target.Value
             Target.Cells(counter, 2).Value = choiObj.PasteTranslatedCategories(choiValue, trads)
@@ -167,23 +167,23 @@ Public Sub UpdateDiseaseSheet(ByVal disSh As Worksheet, ByVal Target As Range)
 
 
     'For core variables, update the visibility to always visible if possible
-    If Not (Intersect(Target, Lo.ListColumns(5).Range) Is Nothing) Then
-        For counter = 1 To Target.Rows.Count    
-            If Target.Cells(counter, 1).Value = ribTrads.TranslatedValue("coreVar") Then
-                On Error Resume Next
-                    Target.Cells(counter, 2).Value = ribTrads.TranslatedValue("alwaysVis")
-                    Target.Cells(counter, 2).Font.Color = RGB(59, 8, 145)
-                    Target.Cells(counter, 2).Font.Italic = True
-                On Error GoTo 0
-            Else
-                On Error Resume Next
-                    Target.Cells(counter, 2).ClearContents
-                    Target.Cells(counter, 2).Font.Color = vbBlack
-                    Target.Cells(counter, 2).Font.Italic = False
-                On Error GoTo 0
-            End If
-        Next
-    End If
+    ' If Not (Intersect(Target, Lo.ListColumns(5).Range) Is Nothing) Then
+    '     For counter = 1 To Target.Rows.Count    
+    '         If Target.Cells(counter, 1).Value = ribTrads.TranslatedValue("coreVar") Then
+    '             On Error Resume Next
+    '                 Target.Cells(counter, 2).Value = ribTrads.TranslatedValue("alwaysVis")
+    '                 Target.Cells(counter, 2).Font.Color = RGB(59, 8, 145)
+    '                 Target.Cells(counter, 2).Font.Italic = True
+    '             On Error GoTo 0
+    '         Else
+    '             On Error Resume Next
+    '                 Target.Cells(counter, 2).ClearContents
+    '                 Target.Cells(counter, 2).Font.Color = vbBlack
+    '                 Target.Cells(counter, 2).Font.Italic = False
+    '             On Error GoTo 0
+    '         End If
+    '     Next
+    ' End If
 
     pass.Protect dissh
 End Sub

src/bin/master-setup/master_setup_dev.xlsb

@@ -143,7 +143,7 @@ Attribute clickFilters.VB_Description = "Callback for btnFilt onAction: clear al
     NotBusyApp
 End Sub
 
-'Translation worksheet =========================================================
+'Translation worksheet =======================================================================================
 
 '@Description("Callback for editLang onChange: Add a language to translation table")
 '@EntryPoint
@@ -206,7 +206,7 @@ Attribute clickUpdateTranslate.VB_Description = "Callback for btnTransUp onActio
     CleanUpdateColumns
     UpdateWatchedValues
     NotBusyApp
-    MsgBox "Done!"
+    MsgBox trads.TransalatedValue("done")
 End Sub
 
 Private Sub CleanUpdateColumns()
@@ -441,93 +441,4 @@ Attribute clickLangChange.VB_Description = "Callback for langDrop onAction: Chan
 ExitLang:
     NotBusyApp
     Application.EnableEvents = True
-End Sub
-
-
-
-Public Sub TranslateWbElmts(ByVal langId As String)
-
-    Dim wb As Workbook
-    Dim pass As IPasswords
-    Dim drop As IDropdownLists
-    Dim sh As Worksheet
-    Dim hRng As Range
-    Dim trads As ITranslation
-    Dim selectValue As String
-    
-    Set wb = ThisWorkbook
-    Set pass = Passwords.Create(wb.Worksheets(PASSSHEETNAME))
-    Set trads = Translation.Create(wb.Worksheets(TRADTABLESHEET).ListObjects(1), langId)
-    Set drop = DropdownLists.Create(wb.Worksheets(DROPSHEET))
-    selectValue = trads.TranslatedValue("selectValue")
-
-    For Each sh In wb.Worksheets
-
-        'Update elements in the disease worksheet
-        If sh.Cells(2, 4).Value = "DISSHEET" Then
-            pass.UnProtect sh
-
-            'Change the headers to the corresponding language
-            Set hRng = sh.ListObjects(1).HeaderRowRange
-            hRng.Cells(1, 1).Value = trads.TranslatedValue("varSection")
-            hRng.Cells(1, 2).Value = trads.TranslatedValue("varName")
-            hRng.Cells(1, 3).Value = trads.TranslatedValue("varLabel")
-            hRng.Cells(1, 4).Value = trads.TranslatedValue("varOrder")
-            hRng.Cells(1, 5).Value = trads.TranslatedValue("varChoice")
-            hRng.Cells(1, 6).Value = trads.TranslatedValue("choiceVal")
-            hRng.Cells(1, 7).Value = trads.TranslatedValue("varStatus")
-
-
-            'Change the dropdown values for the columns status and visibility
-            With sh.ListObjects(1)
-                
-                'variable status
-                drop.SetValidation cellRng:=.ListColumns(5).DataBdoyRange, _
-                                   listName:="__var_status_" & LCase(langId), _
-                                   alertType:="error", _
-                                   message:=selectValue
-                
-                'variable visibility
-                drop.SetValidation cellRng:=.ListColumns(6).DataBodyRange, _
-                                   listName:="__var_status_" & LCase(langId), _
-                                   alertType:="error", message:=selectValue
-            End With
-
-            pass.Protect sh
-
-        'Update columns in the variable worksheet
-        
-        ElseIf sh.Name = "Variables" Then
-
-
-            Set hRng = sh.ListObjects(1).HeaderRowRange
-            
-            pass.UnProtect sh
-            
-            hRng.Cells(1, 1).Value = trads.TranslatedValue("varName")
-            hRng.Cells(1, 2).Value = trads.TranslatedValue("varLabel")
-            hRng.Cells(1, 3).Value = trads.TranslatedValue("defChoice")
-            hRng.Cells(1, 4).Value = trads.TranslatedValue("choiceVal")
-            hRng.Cells(1, 5).Value = trads.TranslatedValue("defStatus")
-            hRng.Cells(1, 6).Value = trads.TranslatedValue("comments")
-
-            'Variable status validation
-            pass.Protect sh
-
-        ElseIf sh.Name = "Choices" Then
-
-            Set hRng = sh.ListObjects(1).HeaderRowRange
-            
-            pass.UnProtect sh
-
-            hRng.Cells(1, 1).Value = trads.TranslatedValue("listName")
-            hRng.Cells(1, 2).Value = trads.TranslatedValue("orderingList")
-            hRng.Cells(1, 3).Value = trads.TranslatedValue("longLabel")
-            hRng.Cells(1, 4).Value = trads.TranslatedValue("shortLabel")
-            
-
-            pass.Protect sh
-        End If
-
-    Next
-End Sub
+End Sub

src/msetup-codes/classes/CustomTable.cls

@@ -93,7 +93,7 @@ Public Sub ExportForMigration()
     Dim outwb As Workbook
 
     BusyApp
-    On Error GoTo ExitExport
+    'On Error GoTo ExitExport
 
     InitializeTrads
 
@@ -126,17 +126,6 @@ Public Sub ImportFlatFile()
 
 
 
-    Set lstSheets = New BetterArray
-    Set io = OSFiles.Create
-
-    'Load the corresponding file for import
-
-
-    'Import translation, Choices, and variables
-    lstSheets.Push 
-
-
-