Version 5.22.0.9001

2017 Mid-Season Updates Fixes #104 initialize form button whose fore color was saved in the already initialized (red) state Fixes #105 checkboxes in odd state - normal (not triple state) checkboxes were disabled due to form being saved in disabled state
envisionnw · Aug 17, 2017 · a2c71fd · a2c71fd
1 parent 519da44
commit a2c71fd
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 31 deletions.
diff --git a/Upland.zip b/Upland.zip
diff --git a/source/forms/frm_Data_Entry.bas b/source/forms/frm_Data_Entry.bas
@@ -20,9 +20,9 @@ Begin Form
     Width =16296
     DatasheetFontHeight =10
     ItemSuffix =213
-    Left =855
+    Left =7260
     Top =3180
-    Right =16185
+    Right =22590
     Bottom =14220
     DatasheetGridlinesColor =12632256
     Filter ="[Location_ID]='{E35D7F2C-A99C-41FE-ACEC-A1DAD79E24AC}' AND [Event_ID]='201704101"
@@ -797,7 +797,6 @@ Begin Form
                                     LayoutCachedHeight =2100
                                 End
                                 Begin CheckBox
-                                    Enabled = NotDefault
                                     OverlapFlags =215
                                     Left =11340
                                     Top =1770

diff --git a/source/forms/frm_LP_Belt_Transect.bas b/source/forms/frm_LP_Belt_Transect.bas
@@ -6,7 +6,6 @@ Begin Form
     AutoCenter = NotDefault
     NavigationButtons = NotDefault
     DividingLines = NotDefault
-    FilterOn = NotDefault
     AllowDesignChanges = NotDefault
     DefaultView =0
     ScrollBars =2
@@ -19,10 +18,10 @@ Begin Form
     Width =13680
     DatasheetFontHeight =9
     ItemSuffix =70
-    Left =-930
-    Top =270
-    Right =14325
-    Bottom =9750
+    Left =855
+    Top =2805
+    Right =16110
+    Bottom =12030
     DatasheetGridlinesColor =12632256
     RecSrcDt = Begin
         0x2518a6c77056e340
@@ -508,7 +507,6 @@ Begin Form
                                     LayoutCachedHeight =1320
                                 End
                                 Begin CheckBox
-                                    Enabled = NotDefault
                                     OverlapFlags =215
                                     Left =10740
                                     Top =990
@@ -847,7 +845,6 @@ Begin Form
                                     LayoutCachedHeight =1380
                                 End
                                 Begin CheckBox
-                                    Enabled = NotDefault
                                     OverlapFlags =247
                                     Left =10920
                                     Top =1050

diff --git a/source/forms/frm_Site_Impact.bas b/source/forms/frm_Site_Impact.bas
@@ -5,7 +5,6 @@ Begin Form
     AutoCenter = NotDefault
     NavigationButtons = NotDefault
     DividingLines = NotDefault
-    FilterOn = NotDefault
     AllowDesignChanges = NotDefault
     DefaultView =0
     ScrollBars =0
@@ -18,10 +17,10 @@ Begin Form
     Width =12600
     DatasheetFontHeight =9
     ItemSuffix =62
-    Left =-1110
-    Top =270
-    Right =11490
-    Bottom =10080
+    Left =675
+    Top =2805
+    Right =13020
+    Bottom =12360
     DatasheetGridlinesColor =12632256
     RecSrcDt = Begin
         0xd4e1e7326d12e340
@@ -366,7 +365,6 @@ Begin Form
                     LayoutCachedHeight =1380
                 End
                 Begin CheckBox
-                    Enabled = NotDefault
                     OverlapFlags =215
                     Left =6900
                     Top =1050
@@ -418,7 +416,6 @@ Begin Form
                     LayoutCachedHeight =6060
                 End
                 Begin CheckBox
-                    Enabled = NotDefault
                     OverlapFlags =215
                     Left =7980
                     Top =5730

diff --git a/source/forms/fsub_LP_Intercept.bas b/source/forms/fsub_LP_Intercept.bas
@@ -6,7 +6,6 @@ Begin Form
     AutoCenter = NotDefault
     NavigationButtons = NotDefault
     AllowAdditions = NotDefault
-    FilterOn = NotDefault
     AllowDesignChanges = NotDefault
     ScrollBars =2
     TabularFamily =126
@@ -17,10 +16,8 @@ Begin Form
     Width =13980
     DatasheetFontHeight =9
     ItemSuffix =107
-    Left =-930
-    Top =810
-    Right =12585
-    Bottom =9180
+    Right =11880
+    Bottom =8370
     DatasheetGridlinesColor =12632256
     RecSrcDt = Begin
         0xb0c0f4149355e340
@@ -165,7 +162,7 @@ Begin Form
                     Top =60
                     Width =1500
                     Height =300
-                    ForeColor =255
+                    ForeColor =2012742
                     Name ="ButtonInitialize"
                     Caption ="Initialize Form"
                     OnClick ="[Event Procedure]"
@@ -659,12 +656,14 @@ Option Explicit
 ' =================================
 ' MODULE:       Form_fsub_LP_Intercept
 ' Level:        Form module
-' Version:      1.01
+' Version:      1.02
 ' Description:  data functions & procedures specific to LP intercept monitoring
 '
 ' Source/date:  Bonnie Campbell, 2/09/2016
 ' Revisions:    RDB - unknown  - 1.00 - initial version
 '               BLC - 2/9/2016 - 1.01 - added documentation, checkbox for no species found
+'               BLC - 8/17/2017 - 1.02 - switched from long to constant colors for readability
+'                                        Son initialize fore color
 ' =================================
 
 ' ---------------------------------
@@ -695,7 +694,7 @@ On Error GoTo Err_Handler
 
     On Error GoTo Err_Handler
     If IsNull(Me!Transect_ID) Then
-      Me!ButtonInitialize.ForeColor = 8421376
+      Me!ButtonInitialize.ForeColor = lngDkBrtGrn '8421376
       GoTo Exit_Handler
     End If
     CurrentPointID = Me!Transect_ID
@@ -705,9 +704,9 @@ On Error GoTo Err_Handler
     Set Points = db.OpenRecordset(strSQL)
 
     If Points.EOF Or IsNull(Points!Point) Then
-      Me!ButtonInitialize.ForeColor = 8421376
+      Me!ButtonInitialize.ForeColor = lngDkBrtGrn '8421376
     Else
-      Me!ButtonInitialize.ForeColor = 255
+      Me!ButtonInitialize.ForeColor = lngRed '255
       If IsNull(Me!Top) Then
         Me!Alive.Enabled = False
       Else

diff --git a/source/modules/mod_Color.bas b/source/modules/mod_Color.bas
@@ -4,7 +4,7 @@ Option Explicit
 ' =================================
 ' MODULE:       mod_Color
 ' Level:        Framework module
-' Version:      1.08
+' Version:      1.09
 ' Description:  color functions & procedures
 '
 ' Source/date:  Bonnie Campbell, 2/9/2015
@@ -17,6 +17,7 @@ Option Explicit
 '               BLC, 2/22/2017 - 1.06 - added RandomColor()
 '               BLC, 3/8/2017 - 1.07 - imported into invasives
 '               BLC, 7/28/2017 - 1.08 - added lngLtrYellow
+'               BLC, 8/17/2017 - 1.09 - added Initialize button green lngDkGrn
 ' =================================
 
 ' ---------------------------------
@@ -59,6 +60,7 @@ Public Const lngLtBlue As Long = 16777164   '?RGB(204,255,255) #CCFFFF
 Public Const lngRed As Long = 255           '?RGB(255,0,0) #FF0000
 Public Const lngGreen As Long = 65280       '?RGB(0,255,0) #00FF00
 Public Const lngDkGreen As Long = 690698    '?RGB(10,138,10) #0A8A0A
+Public Const lngDkBrtGrn As Long = 8421376  '?RGB(0,128,128.5) #008080
 Public Const lngRobinEgg As Long = 16772541 '?RGB(189,237,255) #BDEDFF robin's egg blue
 Public Const lngLtCyan As Long = 16777184   '?RGB(224,255,255) #E0FFFF
 Public Const lngGrnApple As Long = 1557580  '?RGB(76,196,23) #4CC417

diff --git a/source/queries/usys_temp_display.bas b/source/queries/usys_temp_display.bas
@@ -1,5 +1,9 @@
-dbMemo "SQL" ="SELECT *\015\012FROM qc_ndc_notrecorded_all_methods\015\012WHERE Unit_Code = 'AR"
-    "CH'\015\012AND Plot_ID = 1\015\012AND Start_Date = #4/10/2017#;\015\012"
+dbMemo "SQL" ="SELECT DISTINCT qry_Sp_Rpt_All.Unit_Code, qry_Sp_Rpt_All.Year, qry_Sp_Rpt_All.Pl"
+    "ot_ID, qry_Sp_Rpt_All.Master_Family, qry_Sp_Rpt_All.Utah_Species\015\012FROM qry"
+    "_Sp_Rpt_All\015\012WHERE Unit_Code = 'ARCH' \015\012AND Plot_ID = 1 \015\012AND "
+    "\015\012qry_Sp_Rpt_All.Year = Year(#4/10/2017#)\015\012ORDER BY qry_Sp_Rpt_All.U"
+    "nit_Code, qry_Sp_Rpt_All.Plot_ID, qry_Sp_Rpt_All.Master_Family, qry_Sp_Rpt_All.U"
+    "tah_Species;\015\012"
 dbMemo "Connect" =""
 dbBoolean "ReturnsRecords" ="-1"
 dbInteger "ODBCTimeout" ="60"

diff --git a/source/queries/usys_temp_qdf.bas b/source/queries/usys_temp_qdf.bas
@@ -1,4 +1,4 @@
-dbMemo "SQL" ="SELECT Remarks\015\012FROM tsys_Db_Templates\015\012WHERE ID = 81;\015\012"
+dbMemo "SQL" ="SELECT Remarks\015\012FROM tsys_Db_Templates\015\012WHERE ID = 82;\015\012"
 dbMemo "Connect" =""
 dbBoolean "ReturnsRecords" ="-1"
 dbInteger "ODBCTimeout" ="60"