Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev oipc #5008

Merged
merged 165 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
6fb0eee
Merge pull request #4688 from bcgov/dev-marshal-DV-merge
aparna-aot Nov 1, 2023
f8b8e77
fix for ldd miscalculation
Nov 15, 2023
322f807
refactored the code
Nov 15, 2023
5bf2e0b
Merge pull request #4725 from bcgov/dev-DV-4702
divyav-aot Nov 15, 2023
099d9cf
logs added
Nov 15, 2023
e75e08f
Merge pull request #4726 from bcgov/dev-DV-4702
divyav-aot Nov 15, 2023
9961af5
fix for nextstatename check
Nov 15, 2023
3718696
fix for nextstatename check
Nov 15, 2023
df158d5
Merge pull request #4727 from bcgov/dev-DV-4702
divyav-aot Nov 15, 2023
a14129e
fix undeclared js variable error
nkan-aot2 Nov 15, 2023
efc30d0
Merge pull request #4728 from bcgov/dev-NK-4704
nkan-aot Nov 15, 2023
01a1a44
fixed log error
Nov 16, 2023
520cf9f
Merge pull request #4729 from bcgov/dev-DV-4702
divyav-aot Nov 16, 2023
35faacc
removed logs
Nov 16, 2023
dc8f68c
Merge pull request #4731 from bcgov/dev-DV-4702
divyav-aot Nov 16, 2023
34ba0f0
Update crypto-js and remove jsonwebtoken
milosdes Nov 16, 2023
5252f14
Package-lock
milosdes Nov 16, 2023
bef117f
fix undeclared js variable error 2
nkan-aot2 Nov 16, 2023
3e0137d
build error fix _message
Nov 16, 2023
22cb959
Merge pull request #4735 from bcgov/dev-NK-4704
nkan-aot Nov 16, 2023
fa976f8
Merge pull request #4733 from bcgov/dev
divyav-aot Nov 16, 2023
01635e8
Update fee_service.py
divyav-aot Nov 17, 2023
4166929
Added response in the onhold state dropdown
Nov 17, 2023
251981e
Merge branch 'dev' into dev-DV-4721
Nov 17, 2023
d86e4bb
allow assignment to processing teams for personal requests before ope…
nkan-aot Nov 17, 2023
e6dcb54
Update fee_service.py
divyav-aot Nov 18, 2023
18d0716
Update fee_service.py
divyav-aot Nov 18, 2023
87f8eaa
Merge pull request #4740 from bcgov/dev-DV-4721
divyav-aot Nov 20, 2023
45ef695
Update fee_service.py
divyav-aot Nov 21, 2023
a604811
Merge pull request #4751 from bcgov/dev
divyav-aot Nov 21, 2023
d9dfd1d
Merge pull request #4732 from bcgov/dev-marshal-MD-4689
milosdes Nov 21, 2023
f8f0020
moved unSavedRequest state declaration to the top
milosdes Nov 21, 2023
421e476
Fix indent
milosdes Nov 21, 2023
d4d1647
Remove whitespace
milosdes Nov 21, 2023
fd81618
Merge pull request #4760 from bcgov/dev-marshal-MD-4717
milosdes Nov 22, 2023
724d628
Merge pull request #4742 from bcgov/test-marshal-NK-4352
milosdes Nov 22, 2023
88773a2
Merge branch 'dev' into dev-marshal-MD-4689
milosdes Nov 22, 2023
d320a67
Merge pull request #4766 from bcgov/dev-marshal-MD-4689
milosdes Nov 22, 2023
16a16dd
Merge pull request #4765 from bcgov/test-marshal
milosdes Nov 22, 2023
d1190e0
migration script for statelabel
Nov 23, 2023
01e19cd
Merge branch 'test-marshal-DV-4707' into dev-shiva-4707-marshal
Nov 23, 2023
0b07ce8
statusEnum and migrationscript changes
Nov 24, 2023
0e7d832
stateEnum changes to FE and BE
Nov 27, 2023
11ce313
mute notifications for mcf #4548
richard-aot Nov 27, 2023
9a3e59f
env variable for mute notification
richard-aot Nov 28, 2023
5efd0e0
Merge branch 'dev' of github.com:bcgov/foi-flow into dev-RQ-4548
richard-aot Nov 28, 2023
bdbeb42
Merge pull request #4786 from bcgov/dev-RQ-4548
richard-aot Nov 28, 2023
ba5a937
bug fix:
richard-aot Nov 29, 2023
e96fb01
Merge pull request #4794 from bcgov/dev-RQ-4548
richard-aot Nov 29, 2023
9e8638b
add mute to notification manager
richard-aot Nov 29, 2023
9f95cfc
bug fix:
richard-aot Nov 29, 2023
c6beb33
fix codesmell
richard-aot Nov 29, 2023
9c95a66
Merge pull request #4797 from bcgov/dev-RQ-4548
richard-aot Nov 29, 2023
a220bb5
bug fix
richard-aot Nov 30, 2023
af5aa29
bug fix
richard-aot Nov 30, 2023
96bf970
Merge pull request #4800 from bcgov/dev-RQ-4548
richard-aot Nov 30, 2023
2a367c7
bug fix and code cleanup
richard-aot Nov 30, 2023
aea3ee6
Merge pull request #4803 from bcgov/dev-RQ-4548
richard-aot Nov 30, 2023
1091827
Merge pull request #4807 from bcgov/test-marshal-merge
divyav-aot Nov 30, 2023
6efa717
Merge branch 'test-marshal' into test-marshal-DV-4707-1
Nov 30, 2023
9ff9448
#4711 ETL packages for assignees, Team updtes
abin-aot Nov 30, 2023
182e418
Merge pull request #4809 from bcgov/dev
richard-aot Nov 30, 2023
4cd7dcc
Merge pull request #4812 from bcgov/dev-AA-4711
abin-aot Dec 1, 2023
f7960b1
updated the query sequence
Dec 8, 2023
1d91c85
Merge branch 'dev-shiva-4707-marshal' into test-marshal-DV-4707-1
Dec 8, 2023
d6de490
bug fix - show requests in processing team queue
Dec 11, 2023
19fd980
refactored the code
Dec 11, 2023
bcfe359
fixed the bug to show only the request belong to intake should show i…
Dec 11, 2023
14e2889
Merge pull request #4860 from bcgov/dev-DV-4854
divyav-aot Dec 11, 2023
73da845
fix issue related to assignment
Dec 11, 2023
ef04d7a
migration script for statelabel
Nov 23, 2023
2fef1e6
fixed migration script issue
Dec 12, 2023
4bc1107
Update notification refactoring
Nov 30, 2023
28320d8
statusEnum and migrationscript changes
Nov 24, 2023
939fd21
stateEnum changes to FE and BE
Nov 27, 2023
d871ad6
mute notifications for mcf #4548
richard-aot Nov 27, 2023
a2a9803
Fix indent
milosdes Nov 21, 2023
6128e78
Remove whitespace
milosdes Nov 21, 2023
d41dee4
bug fix:
richard-aot Nov 29, 2023
3baf4ea
Merge pull request #4877 from bcgov/dev
divyav-aot Dec 12, 2023
7a79e8d
add mute to notification manager
richard-aot Nov 29, 2023
825bccd
Refacoring status labels for notifications
Dec 11, 2023
b922383
Fix merge conflicts
Dec 12, 2023
5759e49
Merge branch 'test-shiva-4707-marshal' into test-marshal-DV-4707-1
Dec 12, 2023
33088b0
Merge branch 'dev' into test-shiva-4707-marshal
Dec 12, 2023
12cfdab
update to migration script
Dec 12, 2023
0f25791
Merge pull request #4881 from bcgov/test-shiva-4707-marshal
divyav-aot Dec 12, 2023
2ff0765
minor fix related to query
Dec 13, 2023
7608998
Merge branch 'test-marshal' into test-marshal-DV-4707-1
Dec 13, 2023
09c915d
Merge pull request #4884 from bcgov/test-marshal-DV-4707-1
divyav-aot Dec 13, 2023
d4e073d
removed print statement
Dec 15, 2023
e98d801
Merge pull request #4901 from bcgov/dev-DV-4859
divyav-aot Dec 15, 2023
34ce72f
small fix for log error
Dec 15, 2023
e4def97
Merge pull request #4902 from bcgov/dev-DV-4859
divyav-aot Dec 15, 2023
289930b
small update to the query sequence
Dec 15, 2023
8120b28
Merge pull request #4903 from bcgov/test-marshal-DV-4707-1
divyav-aot Dec 15, 2023
101171d
#4899 - hotfix try out
abin-aot Dec 19, 2023
33f69f9
Merge pull request #4910 from bcgov/dev-AA-4899-hotfix
abin-aot Dec 19, 2023
2d69888
#4899 hotfix
abin-aot Dec 19, 2023
9d9c9aa
Merge pull request #4913 from bcgov/dev-AA-4899-hotfix
abin-aot Dec 19, 2023
218f1ea
Merge pull request #4914 from bcgov/dev
abin-aot Dec 19, 2023
f0368a7
Fix notifation manager issues
Dec 20, 2023
19b216a
Update and fix harms download message
Dec 20, 2023
26b37b6
Clean up print statement
Dec 20, 2023
f0dba1f
Clean up print statement
Dec 20, 2023
7e27d2f
Clean up print statement
Dec 20, 2023
f5240e3
Merge pull request #4918 from bcgov/test-shiva-4707-marshal
antsand Dec 21, 2023
7d8cb5d
event queue load error fixed
Dec 22, 2023
fca7aba
Merge pull request #4932 from bcgov/test-marshal-DV-4707-1
divyav-aot Dec 22, 2023
c5e41ec
Merge branch 'dev' into test-marshal-DV-merge-dev
Jan 3, 2024
d85267e
Merge pull request #4950 from bcgov/test-marshal-DV-merge-dev
divyav-aot Jan 3, 2024
c999ae5
fix to show notification for triggered user
Jan 3, 2024
43790bf
Merge pull request #4956 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 3, 2024
d782442
fix to show notification for triggered user
Jan 3, 2024
15f46e8
Merge pull request #4957 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 3, 2024
4d6d934
Merge pull request #4958 from bcgov/test-marshal
divyav-aot Jan 3, 2024
fa51cdd
Update FOIMinistryRequests.py
divyav-aot Jan 4, 2024
546ceab
query fixed
Jan 4, 2024
f906b1c
Merge branch 'dev' into test-marshal-DV-4707-1
Jan 4, 2024
3722c05
Merge pull request #4962 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 4, 2024
47ae0f7
debug statements
Jan 4, 2024
67e418c
Merge branch 'dev' into test-marshal-DV-4707-1
Jan 4, 2024
6a1adf2
Merge pull request #4965 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 4, 2024
76f2b4c
Added debug meesage for post reminder event
Jan 4, 2024
43bc173
Added debug meesage for post reminder event
Jan 4, 2024
0b77a82
Merge branch 'dev' into dev-shiva-4077
antsand Jan 4, 2024
25fd015
Merge pull request #4966 from bcgov/dev-shiva-4077
divyav-aot Jan 4, 2024
0eef0f9
added isdeleted=false
Jan 4, 2024
68255c1
Merge pull request #4968 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 4, 2024
e128094
Added more logs
Jan 4, 2024
e42b168
Added more logs
Jan 5, 2024
33139c9
Merge pull request #4969 from bcgov/dev-shiva-4077
antsand Jan 5, 2024
9274c3d
Added more logs
Jan 5, 2024
ef4e2a8
Merge pull request #4972 from bcgov/dev-shiva-4077
antsand Jan 5, 2024
6ab5bc1
Fetch data from enum not from the database
Jan 5, 2024
af1d67d
Merge pull request #4973 from bcgov/dev-shiva-4077
antsand Jan 5, 2024
8f478ad
query updated
Jan 5, 2024
f7ed9e8
Merge branch 'dev' into test-marshal-DV-4707-1
Jan 5, 2024
6d72783
Merge pull request #4974 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 5, 2024
1f922c7
Remove print statements
Jan 5, 2024
765e992
Merge pull request #4978 from bcgov/dev-shiva-4077
antsand Jan 5, 2024
a32c3f7
All notification/user labels must be fetched from cache first
Jan 8, 2024
a65a000
Update None type
Jan 8, 2024
2f3a56c
fixes to notificationtypeid=null, removed logs
Jan 8, 2024
d083be9
merge conflicts fixed
Jan 8, 2024
87c3b55
Merge pull request #4979 from bcgov/dev-shiva-4077
antsand Jan 8, 2024
907694b
Merge branch 'dev' into test-marshal-DV-4707-1
Jan 8, 2024
efa8b27
Merge pull request #4980 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 8, 2024
ef5d348
fixed issue related to groupmember notification
Jan 9, 2024
8545646
Merge branch 'dev' into test-marshal-DV-4707-1
Jan 9, 2024
4054e4e
Merge pull request #4981 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 9, 2024
d6a974d
removed logs
Jan 9, 2024
5fbf2cb
Merge branch 'dev' into test-marshal-DV-4707-1
Jan 9, 2024
ee34250
Merge pull request #4982 from bcgov/test-marshal-DV-4707-1
divyav-aot Jan 9, 2024
5d51fd5
Merge pull request #4985 from bcgov/dev
divyav-aot Jan 9, 2024
47fbb78
Merge remote-tracking branch 'origin/dev-rook' into dev-oipc
Jan 10, 2024
deef574
Changes to default isoipcreview as false.
Jan 10, 2024
971eb7a
Notification type changes.
Jan 11, 2024
eb87fd7
fix for dismiss notification raw request
Jan 16, 2024
a847723
dismiss notification related to tagged comments and triggered user is…
Jan 16, 2024
4082abb
removed commented lines
Jan 16, 2024
9463ba1
Merge pull request #5001 from bcgov/main-DV-4707
divyav-aot Jan 16, 2024
535aaac
CFR notification for watcher: fixed
Jan 17, 2024
243048e
Merge pull request #5002 from bcgov/main-DV-4707
divyav-aot Jan 17, 2024
7398dda
oipc merge
Jan 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
DTS:LocaleID="1033"
DTS:ObjectName="ApplicantRequestMappings"
DTS:PackageType="5"
DTS:VersionBuild="64"
DTS:VersionGUID="{E74162C7-CB89-4371-98DA-C1E08F361BDA}">
DTS:VersionBuild="65"
DTS:VersionGUID="{9F68B623-DB01-4BE6-99AD-D0EF1C647FB7}">
<DTS:Property
DTS:Name="PackageFormatVersion">8</DTS:Property>
<DTS:Variables>
Expand Down Expand Up @@ -62,7 +62,7 @@
<DTS:ObjectData>
<SQLTask:SqlTaskData
SQLTask:Connection="{FA877C17-9970-459F-BFAC-AC1E9E4433B6}"
SQLTask:SqlStatementSource="SELECT &#x9;&#x9;&#x9;&#x9; (SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = requestTypes.iLabelID and terminology.tiLocaleID = 1) as requestType, &#x9;&#x9;&#x9;&#x9; convert(varchar, requests.sdtRequestedDate,120) as receivedDate, &#x9;&#x9;&#x9;&#x9; requests.vcDescription as requestdescription, &#x9;&#x9;&#x9;&#x9; convert(varchar,requests.sdtRqtDescFromdate,120) as reqDescriptionFromDate, &#x9;&#x9;&#x9;&#x9; convert(varchar,requests.sdtRqtDescTodate,120) as reqDescriptionToDate, &#x9;&#x9;&#x9;&#x9; (SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = deliveryModes.iLabelID and terminology.tiLocaleID = 1) as deliveryMode, &#x9;&#x9;&#x9;&#x9; (SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = receivedModes.iLabelID and terminology.tiLocaleID = 1) as receivedMode,&#x9;&#x9;&#x9;&#x9; &#x9;&#x9;&#x9;&#x9; requesterTypes.vcDescription as category, &#x9;&#x9;&#x9;&#x9;requests.vcVisibleRequestID as filenumber FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesterTypes requesterTypes WITH (NOLOCK) ON requests.tiRequesterCategoryID = requesterTypes.tiRequesterTypeID &#x9;&#x9;&#x9;&#x9; LEFT OUTER JOIN tblRequestStatuses requeststatuses WITH (NOLOCK) on requests.irequeststatusid = requeststatuses.irequeststatusid LEFT OUTER JOIN tblReceivedModes receivedModes WITH (NOLOCK) ON requests.tiReceivedType = receivedModes.tiReceivedModeID LEFT OUTER JOIN tblDeliveryModes deliveryModes WITH (NOLOCK) ON requests.tiDeliveryType = deliveryModes.tiDeliveryModeID LEFT OUTER JOIN tblRequestTypes requestTypes WITH (NOLOCK) ON requests.tiRequestTypeID = requestTypes.tiRequestTypeID WHERE vcVisibleRequestID IN ('CFD-2022-20261', 'CFD-2021-14313','CFD-2021-12866' , 'CFD-2021-12905', 'CFD-2021-12651') AND &#x9;&#x9;&#x9;&#x9; &#x9;&#x9;&#x9;&#x9; office.OFFICE_CODE = 'CFD' &#x9;&#x9;&#x9;&#x9; &#x9;&#x9;&#x9;&#x9;AND requests.vcRequestStatus NOT IN ('Closed') GROUP BY requests.vcVisibleRequestID,requests.vcRequestStatus,requeststatuses.vcRequestStatus,requests.sdtReceivedDate, requests.sdtTargetDate, requests.sdtOriginalTargetDate, requests.vcDescription, requests.sdtRqtDescFromdate, requests.sdtRqtDescTodate, requests.sdtRequestedDate, office.OFFICE_CODE, requesterTypes.vcDescription, receivedModes.iLabelID, deliveryModes.iLabelID, requests.iRequestID, requestTypes.iLabelID, requests.vcVisibleRequestID, requests.tiOfficeID, office.OFFICE_ID"
SQLTask:SqlStatementSource="SELECT &#x9;(SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = requestTypes.iLabelID and terminology.tiLocaleID = 1) as requestType, &#x9;convert(varchar, requests.sdtRequestedDate,120) as receivedDate, &#x9;requests.vcDescription as requestdescription, &#x9;&#x9; convert(varchar,ISNULL(requests.sdtRqtDescFromdate,''),120) as reqDescriptionFromDate, &#x9;convert(varchar,ISNULL(requests.sdtRqtDescTodate,''),120) as reqDescriptionToDate, &#x9;(SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = deliveryModes.iLabelID and terminology.tiLocaleID = 1) as deliveryMode, &#x9;ISNULL((SELECT REPLACE(terminology.vcTerminology,'-','') from tblTerminologyLookup terminology WHERE terminology.iLabelID = receivedModes.iLabelID and terminology.tiLocaleID = 1),'Email') as receivedMode, &#x9;requesterTypes.vcDescription as category, &#x9;requests.vcVisibleRequestID as filenumber FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesterTypes requesterTypes WITH (NOLOCK) ON requests.tiRequesterCategoryID = requesterTypes.tiRequesterTypeID LEFT OUTER JOIN tblRequestStatuses requeststatuses WITH (NOLOCK) on requests.irequeststatusid = requeststatuses.irequeststatusid LEFT OUTER JOIN tblReceivedModes receivedModes WITH (NOLOCK) ON requests.tiReceivedType = receivedModes.tiReceivedModeID LEFT OUTER JOIN tblDeliveryModes deliveryModes WITH (NOLOCK) ON requests.tiDeliveryType = deliveryModes.tiDeliveryModeID LEFT OUTER JOIN tblRequestTypes requestTypes WITH (NOLOCK) ON requests.tiRequestTypeID = requestTypes.tiRequestTypeID WHERE vcVisibleRequestID IN ('CFD-2020-03214','CFD-2020-03700','CFD-2021-10406','CFD-2021-10681','CFD-2021-10702','CFD-2021-10798','CFD-2021-10822','CFD-2021-11012','CFD-2021-11041','CFD-2021-11178','CFD-2021-11197','CFD-2021-11211','CFD-2021-11289','CFD-2021-11430','CFD-2021-11528','CFD-2021-11544','CFD-2021-11548','CFD-2021-11646','CFD-2021-11660','CFD-2021-11669','CFD-2021-11682','CFD-2021-11852','CFD-2021-11857','CFD-2021-11941','CFD-2021-11993','CFD-2021-12019','CFD-2021-12022','CFD-2021-12026','CFD-2021-12033','CFD-2021-12044','CFD-2021-12061','CFD-2021-12062','CFD-2021-12120','CFD-2021-12125','CFD-2021-12167','CFD-2021-12170','CFD-2021-12362','CFD-2021-12371','CFD-2021-12405','CFD-2021-12408','CFD-2021-12457','CFD-2021-12520','CFD-2021-12544','CFD-2021-12573','CFD-2021-12592','CFD-2021-12699','CFD-2021-12705','CFD-2021-12828','CFD-2021-12851','CFD-2021-12866','CFD-2021-12869','CFD-2021-12871','CFD-2021-12879','CFD-2021-12905','CFD-2021-12919','CFD-2021-12949','CFD-2021-12968','CFD-2021-12990','CFD-2021-12997','CFD-2021-13018','CFD-2021-13021','CFD-2021-13081','CFD-2021-13088','CFD-2021-13116','CFD-2021-13124','CFD-2021-13135','CFD-2021-13183','CFD-2021-13289','CFD-2021-13298','CFD-2021-13300','CFD-2021-13308','CFD-2021-13406','CFD-2021-13410','CFD-2021-13411','CFD-2021-13414','CFD-2021-13421','CFD-2021-13505','CFD-2021-13532','CFD-2021-13545','CFD-2021-13581','CFD-2021-13589','CFD-2021-13631','CFD-2021-13633','CFD-2021-13640','CFD-2021-13678','CFD-2021-13683','CFD-2021-13741','CFD-2021-13778','CFD-2021-13780','CFD-2021-13795','CFD-2021-13798','CFD-2021-13834','CFD-2021-13856','CFD-2021-13927','CFD-2021-13935','CFD-2021-13965','CFD-2021-13984','CFD-2021-14015','CFD-2021-14016','CFD-2021-14019','CFD-2021-14023','CFD-2021-14031','CFD-2021-14065','CFD-2021-14081','CFD-2021-14084','CFD-2021-14129','CFD-2021-14189','CFD-2021-14213','CFD-2021-14221','CFD-2021-14248','CFD-2021-14313','CFD-2021-14314','CFD-2021-14317','CFD-2021-14340','CFD-2021-14366','CFD-2021-14381','CFD-2021-14415','CFD-2021-14435','CFD-2021-14467') AND office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed','Completed') GROUP BY requests.vcVisibleRequestID,requests.vcRequestStatus,requeststatuses.vcRequestStatus,requests.sdtReceivedDate, requests.sdtTargetDate, requests.sdtOriginalTargetDate, requests.vcDescription, requests.sdtRqtDescFromdate, requests.sdtRqtDescTodate, requests.sdtRequestedDate, office.OFFICE_CODE, requesterTypes.vcDescription, receivedModes.iLabelID, deliveryModes.iLabelID,requests.iRequestID, requestTypes.iLabelID, requests.vcVisibleRequestID, requests.tiOfficeID, office.OFFICE_ID"
SQLTask:ResultType="ResultSetType_Rowset" xmlns:SQLTask="www.microsoft.com/sqlserver/dts/tasks/sqltask">
<SQLTask:ResultBinding
SQLTask:ResultName="0"
Expand Down Expand Up @@ -166,7 +166,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="EST_Applicant"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="1">
DTS:ThreadHint="0">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -200,7 +200,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="Execute SQL Task"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="0">
DTS:ThreadHint="2">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -261,12 +261,12 @@
DTS:LocaleID="-1"
DTS:ObjectName="EST_getrequestapplicantid"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="1">
DTS:ThreadHint="0">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
SQLTask:Connection="{18EF9DFD-37E1-484D-9BC1-BFE418845E48}"
SQLTask:SqlStatementSource="SELECT foirequestapplicantid FROM public.&quot;FOIRequestApplicants&quot; WHERE migrationreference IS NOT NULL and &#xA;position(migrationreference in ? )&gt;0 and firstname = ? and lastname=?"
SQLTask:SqlStatementSource="SELECT foirequestapplicantid FROM public.&quot;FOIRequestApplicants&quot; WHERE migrationreference IS NOT NULL and &#xA;position(? in migrationreference )&gt;0 and firstname = ? and lastname=?"
SQLTask:ResultType="ResultSetType_SingleRow" xmlns:SQLTask="www.microsoft.com/sqlserver/dts/tasks/sqltask">
<SQLTask:ResultBinding
SQLTask:ResultName="1"
Expand Down Expand Up @@ -301,7 +301,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="insertapplicantrequestmapping_behalf"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="1">
DTS:ThreadHint="0">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -343,7 +343,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="insertapplicantrequestmapping_mainapplicant"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="2">
DTS:ThreadHint="1">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -464,27 +464,27 @@
<GraphLayout
Capacity="16" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph" xmlns:mssgle="clr-namespace:Microsoft.SqlServer.Graph.LayoutEngine;assembly=Microsoft.SqlServer.Graph" xmlns:assembly="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mssgm="clr-namespace:Microsoft.SqlServer.Graph.Model;assembly=Microsoft.SqlServer.Graph">
<NodeLayout
Size="170,42"
Size="169.6,41.6"
Id="Package\Execute SQL Task"
TopLeft="485,133" />
<NodeLayout
Size="179,42"
Size="179.2,41.6"
Id="Package\Foreach Loop Container\EST_Applicant"
TopLeft="303,39" />
<NodeLayout
Size="170,42"
Size="169.6,41.6"
Id="Package\Foreach Loop Container\Execute SQL Task"
TopLeft="59,39" />
<NodeLayout
Size="170,42"
Size="169.6,41.6"
Id="Package\Foreach Loop Container\forach_applicantsonrequest\EST_getrequestapplicantid"
TopLeft="172,28" />
<NodeLayout
Size="229,42"
Size="228.8,41.6"
Id="Package\Foreach Loop Container\forach_applicantsonrequest\insertapplicantrequestmapping_behalf"
TopLeft="302,106" />
<NodeLayout
Size="229,42"
Size="228.8,41.6"
Id="Package\Foreach Loop Container\forach_applicantsonrequest\insertapplicantrequestmapping_mainapplicant"
TopLeft="32,110" />
<EdgeLayout
Expand Down Expand Up @@ -562,8 +562,8 @@
<ContainerLayout
HeaderHeight="43"
IsExpanded="True"
PanelSize="551,244"
Size="551,287"
PanelSize="551.2,244"
Size="551.2,287.2"
Id="Package\Foreach Loop Container\forach_applicantsonrequest"
TopLeft="227,162" />
<EdgeLayout
Expand Down Expand Up @@ -603,8 +603,8 @@
<ContainerLayout
HeaderHeight="43"
IsExpanded="True"
PanelSize="783,504"
Size="783,547"
PanelSize="783.2,504"
Size="783.2,547.2"
Id="Package\Foreach Loop Container"
TopLeft="359,293" />
<EdgeLayout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
DTS:LocaleID="1033"
DTS:ObjectName="FOIApplicants"
DTS:PackageType="5"
DTS:VersionBuild="10"
DTS:VersionGUID="{80687E87-9503-4FF7-AB79-273F8A8AA4EF}">
DTS:VersionBuild="12"
DTS:VersionGUID="{57B2A59C-BDE3-4612-A3C1-13569FD94C0F}">
<DTS:Property
DTS:Name="PackageFormatVersion">8</DTS:Property>
<DTS:Variables>
Expand All @@ -25,7 +25,7 @@
DTS:Namespace="User"
DTS:ObjectName="applicantqueryparam">
<DTS:VariableValue
DTS:DataType="8">SELECT firstname,lastname,middleName,requesterid,CONVERT(varchar(MAX),'01-01-1900',120) as birthDate,businessName, GETDATE() as createdAt, 'cfdmigration' as createdBy,STRING_AGG(CAST(requestid as nvarchar(max)),', ') as requests ,MainApplicant FROM ( SELECT requesters.vcEmailID as email, requesters.iRequesterID as requesterid, requesters.vcFirstName as firstName, requesters.vcLastName as lastName, requesters.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, requesters.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 1 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters requesters WITH (NOLOCK) ON requests.iRequesterID = requesters.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON requesters.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') UNION ALL SELECT onbehalf.vcEmailID as email, onbehalf.iRequesterID as requesterid, onbehalf.vcFirstName as firstName, onbehalf.vcLastName as lastName, onbehalf.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, onbehalf.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 0 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters onbehalf WITH (NOLOCK) ON requests.iOnBehalfOf = onbehalf.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON onbehalf.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') and onbehalf.vcFirstName is NOT NULL ) AS T GROUP BY T.email,T.requesterid,T.firstname,T.lastname,T.middleName,T.requesterid,T.birthDate,T.businessName,T.MainApplicant ORDER BY T.firstname ASC</DTS:VariableValue>
DTS:DataType="8">SELECT firstname, lastname, middleName, requesterid, CONVERT(varchar(MAX),birthDate,120) as birthDate, businessName, GETDATE() as createdAt, 'cfdmigration' as createdBy, STRING_AGG(CAST(requestid as nvarchar(max)),', ') as requests , MainApplicant FROM ( SELECT requesters.vcEmailID as email, requesters.iRequesterID as requesterid, requesters.vcFirstName as firstName, requesters.vcLastName as lastName, requesters.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, requesters.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 1 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters requesters WITH (NOLOCK) ON requests.iRequesterID = requesters.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON requesters.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') UNION ALL SELECT onbehalf.vcEmailID as email, onbehalf.iRequesterID as requesterid, onbehalf.vcFirstName as firstName, onbehalf.vcLastName as lastName, onbehalf.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, onbehalf.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 0 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters onbehalf WITH (NOLOCK) ON requests.iOnBehalfOf = onbehalf.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON onbehalf.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') and onbehalf.vcFirstName is NOT NULL ) AS T GROUP BY T.email,T.requesterid,T.firstname,T.lastname,T.middleName,T.requesterid,T.birthDate,T.businessName,T.MainApplicant ORDER BY T.firstname ASC</DTS:VariableValue>
</DTS:Variable>
</DTS:Variables>
<DTS:Executables>
Expand Down Expand Up @@ -591,7 +591,7 @@
<GraphLayout
Capacity="4" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph">
<NodeLayout
Size="155,42"
Size="155.2,41.6"
Id="Package\Data Flow Task"
TopLeft="367,74" />
</GraphLayout>
Expand All @@ -603,13 +603,13 @@
<GraphLayout
Capacity="4" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph" xmlns:mssgle="clr-namespace:Microsoft.SqlServer.Graph.LayoutEngine;assembly=Microsoft.SqlServer.Graph" xmlns:assembly="http://schemas.microsoft.com/winfx/2006/xaml">
<NodeLayout
Size="169,42"
Id="Package\Data Flow Task\ODBC Destination"
TopLeft="328,201" />
<NodeLayout
Size="157,42"
Size="156.8,41.6"
Id="Package\Data Flow Task\OLE DB Source"
TopLeft="327,37" />
<NodeLayout
Size="168.8,41.6"
Id="Package\Data Flow Task\ODBC Destination"
TopLeft="328,201" />
<EdgeLayout
Id="Package\Data Flow Task.Paths[OLE DB Source Output]"
TopLeft="409,79">
Expand Down
Loading
Loading