Skip to content

Commit

Permalink
Version 0.0.0.9096
Browse files Browse the repository at this point in the history
2017 Big Rivers App
Accommodates partial phase II functionality, enhancements and addresses multiple items including:
Partial fixes for #1, #14 & #17
Fixes #2, fixes #9, fixes #13, fixes #18, fixes #15, fixes #19, fixes #23, fixes #20, fixes #11, fixes #22, fixes #23
Closes #1 (actual issue #21)
  • Loading branch information
blcampbell committed Dec 7, 2017
1 parent d6e74d0 commit dfe6846
Show file tree
Hide file tree
Showing 82 changed files with 5,905 additions and 1,141 deletions.
Binary file added big_rivers.zip
Binary file not shown.
Binary file removed big_rivers_new.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion source/forms/Comment.bas
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ On Error GoTo Err_Handler
Me.Title = "Comment"

Me.lineIndicator.Width = Me.Form.Width
Me.lineIndicator.borderColor = lngLime
Me.lineIndicator.BorderColor = lngLime

'defaults
Dim instruction As String
Expand Down
16 changes: 9 additions & 7 deletions source/forms/CommentList.bas
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Begin Form
Width =9060
DatasheetFontHeight =11
ItemSuffix =43
Left =3525
Top =6630
Right =12945
Bottom =10995
Left =4230
Top =7005
Right =13650
Bottom =11370
DatasheetGridlinesColor =14806254
Filter ="CommentType='event' AND CommentType_ID=39"
Filter ="CommentType='event' AND CommentType_ID=38"
RecSrcDt = Begin
0x0a6c31995402e540
End
Expand Down Expand Up @@ -693,14 +693,15 @@ Option Explicit
' =================================
' Form: CommentList
' Level: Application form
' Version: 1.00
' Version: 1.01
' Basis: Dropdown form
'
' Description: List form object related properties, events, functions & procedures for UI display
'
' Source/date: Bonnie Campbell, October 18, 2017
' References: -
' Revisions: BLC - 10/18/2017 - 1.00 - initial version
' BLC - 11/24/2017 - 1.01 - fixed to delete from AppComment vs tsys_Db_Templates
' =================================

'---------------------
Expand Down Expand Up @@ -1014,6 +1015,7 @@ End Sub
' Revisions:
' BLC - 6/1/2016 - initial version
' BLC - 10/16/2017 - revised to use tbxID vs. ID on delete
' BLC - 11/24/2017 - fixed to delete from AppComment vs tsys_Db_Templates
' ---------------------------------
Private Sub btnDelete_Click()
On Error GoTo Err_Handler
Expand All @@ -1024,7 +1026,7 @@ On Error GoTo Err_Handler
result = MsgBox("Delete Record this record: #" & tbxID & " ?" _
& vbCrLf & "This action cannot be undone.", vbYesNo, "Delete Record?")

If result = vbYes Then DeleteRecord "tsys_Db_Templates", tbxID
If result = vbYes Then DeleteRecord "AppComment", tbxID

'clear the deleted record
Me.Requery
Expand Down
11 changes: 6 additions & 5 deletions source/forms/ConnectDbs.bas
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Begin Form
Width =10800
DatasheetFontHeight =10
ItemSuffix =111
Left =3855
Top =2430
Right =23490
Bottom =15015
Left =4065
Top =3105
Right =16815
Bottom =14490
DatasheetGridlinesColor =12632256
RecSrcDt = Begin
0xfe27f5b1c5c3e440
Expand Down Expand Up @@ -1624,12 +1624,13 @@ Private Sub btnUpdateLinks_Click()
End With

' update tsys_Link_Dbs & tsys_Link_Files database name & paths
DoCmd.SetWarnings False 'hide the append dialog
' DoCmd.SetWarnings False 'hide the append dialog

' strSQL = "UPDATE tsys_Link_Files SET Link_File_Path = '" & strNewPath & "', " & _
' "Link_file_name = '" & strNewDb & "' " & _
' "WHERE Link_file_name = '" & strDbName & "';"
strSQL = GetTemplate("u_tsys_Link_Files_new_db", "NewPath" & PARAM_SEPARATOR & strNewPath & "|NewDb" & PARAM_SEPARATOR & strNewDb & "|DbName" & PARAM_SEPARATOR & strNewDb)
Debug.Print strSQL
DoCmd.RunSQL strSQL
DoCmd.SetWarnings True

Expand Down
17 changes: 11 additions & 6 deletions source/forms/Events.bas
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ Begin Form
Width =7860
DatasheetFontHeight =11
ItemSuffix =35
Left =3855
Top =3150
Right =12765
Bottom =14535
Left =4065
Top =3105
Right =16815
Bottom =14490
DatasheetGridlinesColor =14806254
RecSrcDt = Begin
0x656d3fc92f05e540
Expand Down Expand Up @@ -810,8 +810,8 @@ Option Explicit
' =================================
' Form: Events
' Level: Application form
' Version: 1.14
' Basis: Dropdown form
' Version: 1.15
' Basis: Dropdown frm
'
' Description: Events form object related properties, events, functions & procedures for UI display
'
Expand All @@ -836,6 +836,7 @@ Option Explicit
' BLC - 10/24/2017 - 1.12 - comment out unused cbxSite
' BLC - 11/6/2017 - 1.13 - set so Save button only enabled for new events (tbxID = 0)
' BLC - 11/10/2017 - 1.14 - added Form_GotFocus for updating cbxLocation after new location added
' BLC - 11/24/2017 - 1.15 - revised comment button caption
' =================================

'---------------------
Expand Down Expand Up @@ -926,6 +927,7 @@ End Property
' BLC - 1/13/2017 - revised to use && vs. StringFromCodepoint(uAmpersand) for directions
' BLC - 10/16/2017 - added date hint, uncommented ClearForm()
' BLC - 10/24/2017 - commented out unused cbxSite
' BLC - 11/24/2017 - revised comment button caption
' ---------------------------------
Private Sub Form_Open(Cancel As Integer)
On Error GoTo Err_Handler
Expand All @@ -947,6 +949,9 @@ On Error GoTo Err_Handler
Directions = "Choose the site location, then enter the sampling start date."
tbxIcon.Value = StringFromCodepoint(uBullet)
lblDirections.ForeColor = lngLtBlue
btnComment.Caption = StringFromCodepoint(uComment)
btnComment.ForeColor = lngBlue


'set hint
Me.lblHintDate.Caption = "M\DD\YYYY"
Expand Down
16 changes: 5 additions & 11 deletions source/forms/EventsList.bas
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,14 @@ Begin Form
Width =7560
DatasheetFontHeight =11
ItemSuffix =30
Left =285
Top =2985
Right =7920
Bottom =7350
Left =450
Top =3450
Right =7830
Bottom =7560
DatasheetGridlinesColor =14806254
RecSrcDt = Begin
0xc002d3eb7005e540
0x78280a14fe06e540
End
RecordSource ="PARAMETERS pkcode Text ( 255 ), waterway Text ( 255 ); SELECT e.ID, s.SiteCode, "
"e.Site_ID, s.SiteName, loc.LocationName, e.Location_ID, e.StartDate FROM (((Even"
"t AS e INNER JOIN Site AS s ON s.ID = e.Site_ID) INNER JOIN Location AS loc ON l"
"oc.ID = e.Location_ID) INNER JOIN Park AS p ON p.ID = s.Park_ID) INNER JOIN Rive"
"r AS r ON r.ID = s.River_ID WHERE p.ParkCode = [pkcode] AND r.Segment = [waterwa"
"y] ORDER BY e.StartDate DESC , s.SiteName, loc.LocationName; "
Caption ="_List"
OnCurrent ="[Event Procedure]"
OnOpen ="[Event Procedure]"
Expand Down
Loading

0 comments on commit dfe6846

Please sign in to comment.