Skip to content

Commit

Permalink
Merge pull request #2563 from phili67/phili67-pending-sql-upsqte
Browse files Browse the repository at this point in the history 
pending confirm : sql update
  • Loading branch information
@phili67
phili67 committed Mar 19, 2024
2 parents 79889a4 + 7043e48 commit 89f0e2a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/mysql/install/Install.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,10 +1159,10 @@ INSERT INTO `query_qry` (`qry_ID`, `qry_SQL`, `qry_Name`, `qry_Description`, `qr
(32, 'SELECT fam_Name, fam_Envelope, b.fun_Name as Fund_Name, a.plg_amount as Pledge from family_fam left join pledge_plg a on a.plg_famID = fam_ID and a.plg_FYID=~fyid~ and a.plg_PledgeOrPayment=''Pledge'' and a.plg_amount>0 join donationfund_fun b on b.fun_ID = a.plg_fundID order by fam_Name, a.plg_fundID', 'Family Pledge by Fiscal Year', 'Pledge summary by family name for each fund for the selected fiscal year', 1, 4),
(33, 'SELECT per_ID as AddToCart, per_LastName, per_FirstName, per_DateDeactivated as ''GDPR'' FROM `person_per` where per_BirthYear<~the_year~ AND per_cls_ID IN (1,2) AND per_fam_ID<>3 AND `per_ID` NOT IN (SELECT p2g2r_per_ID FROM `person2group2role_p2g2r`) order by per_LastName ASC, per_FirstName ASC', 'Persons not assigned to a group', 'Returns all the persons not assigned to a group.', 1, 1),
(34, 'SELECT per_ID as AddToCart,per_FirstName, per_LastName, grp_Name, per_DateDeactivated as ''GDPR'' FROM `person2group2role_p2g2r`, `person_per`, group_grp WHERE per_cls_ID IN (1,2) AND per_fam_ID<>3 AND p2g2r_per_ID=per_ID and grp_ID=p2g2r_grp_ID order by per_FirstName ASC, per_LastName ASC, grp_Name ASC', 'Person assigned to a group', 'Returns all persons assigned to a group.', 1, 1),
(35, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM `person_per` AS a WHERE per_confirm_report='pending';", 'Awaiting confirmation of persons', 'Find person who are in pending confirmation process', 1, 1),
(36, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report='pending');", 'Awaiting confirmation of families', 'Find families who are in pending confirmation process', 1, 1),
(37, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM `person_per` AS a WHERE per_confirm_report='Done';", 'Done confirmation of persons', 'Look for person who have confirmed', 1, 1),
(38, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report='Done');", 'Done confirmation of families', 'Look for families who have confirmed', 1, 1),
(35,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM `person_per` AS a WHERE per_confirm_report=\'pending\';','Awaiting confirmation of persons','Find person who are in pending confirmation process',1,8),
(36,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report=\'pending\');','Awaiting confirmation of families','Find families who are in pending confirmation process',1,8),
(37,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM `person_per` AS a WHERE per_confirm_report=\'Done\';','Done confirmation of persons','Look for person who have confirmed',1,8),
(38,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report=\'Done\');','Done confirmation of families','Look for families who have confirmed',1,8),
(100, 'SELECT a.per_ID as AddToCart, CONCAT(''<a href=v2/people/person/view/'',a.per_ID,''>'',a.per_FirstName,'' '',a.per_LastName,''</a>'') AS Name, a.per_DateDeactivated as ''GDPR'' FROM person_per AS a LEFT JOIN person2volunteeropp_p2vo p2v1 ON (a.per_id = p2v1.p2vo_per_ID AND p2v1.p2vo_vol_ID = ~volopp1~) LEFT JOIN person2volunteeropp_p2vo p2v2 ON (a.per_id = p2v2.p2vo_per_ID AND p2v2.p2vo_vol_ID = ~volopp2~) WHERE p2v1.p2vo_per_ID=p2v2.p2vo_per_ID ORDER BY per_LastName', 'Volunteers', 'Find volunteers for who match two specific opportunity codes', 1, 6),
(200, 'SELECT a.per_ID as AddToCart, CONCAT(''<a href=v2/people/person/view/'',a.per_ID,''>'',a.per_FirstName,'' '',a.per_LastName,''</a>'') AS Name, a.per_DateDeactivated as ''GDPR'' FROM person_per AS a LEFT JOIN person_custom pc ON a.per_id = pc.per_ID WHERE pc.~custom~ LIKE ''%~value~%'' ORDER BY per_LastName', 'CustomSearch', 'Find people with a custom field value', 1, 7),
(201, 'SELECT a.per_ID as AddToCart, CONCAT(''<a href=v2/people/person/view/'',a.per_ID,''>'',a.per_FirstName,'' '',a.per_LastName,''</a>'') AS Name, a.per_DateDeactivated as ''GDPR'' FROM person_per AS a LEFT JOIN person_custom pc ON a.per_id = pc.per_ID WHERE pc.~custom~ IS ~value~ ORDER BY per_LastName', 'CustomSearch is NULL', 'Find people with a custom field value is NULL', 1, 7);
Expand Down
8 changes: 4 additions & 4 deletions src/mysql/upgrade/8.0.0-upgrade.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,10 @@ ALTER TABLE `person_per` ADD `per_confirm_report` enum('No', 'Pending','Done') d
ALTER TABLE `family_fam` ADD `fam_confirm_report` enum('No', 'Pending','Done') default 'No' COMMENT 'To confirm report of all families';

INSERT IGNORE INTO `query_qry` (`qry_ID`, `qry_SQL`, `qry_Name`, `qry_Description`, `qry_Count`, `qry_Type_ID`) VALUES
(35, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM `person_per` AS a WHERE per_confirm_report='pending';", 'Awaiting confirmation of persons', 'Find person who are in pending confirmation process', 1, 8),
(36, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report='pending');", 'Awaiting confirmation of families', 'Find families who are in pending confirmation process', 1, 8),
(37, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM `person_per` AS a WHERE per_confirm_report='Done';", 'Done confirmation of persons', 'Look for person who have confirmed', 1, 8),
(38, "SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT('<a href=v2/people/person/view/',a.per_ID,'>',a.per_FirstName,' ',a.per_LastName,'</a>') AS Name, a.per_DateDeactivated as 'GDPR' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report='Done');", 'Done confirmation of families', 'Look for families who have confirmed', 1, 8);
(35,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM `person_per` AS a WHERE per_confirm_report=\'pending\';','Awaiting confirmation of persons','Find person who are in pending confirmation process',1,8),
(36,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report=\'pending\');','Awaiting confirmation of families','Find families who are in pending confirmation process',1,8),
(37,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM `person_per` AS a WHERE per_confirm_report=\'Done\';','Done confirmation of persons','Look for person who have confirmed',1,8),
(38,'SELECT a.per_ID as AddToCart, per_Email as Email, CONCAT(\'<a href=v2/people/person/view/\',a.per_ID,\'>\',a.per_FirstName,\' \',a.per_LastName,\'</a>\') AS Name, a.per_DateDeactivated as \'GDPR\' FROM person_per AS a WHERE `per_fam_ID` IN (SELECT F.fam_ID FROM `family_fam` AS F WHERE F.fam_confirm_report=\'Done\');','Done confirmation of families','Look for families who have confirmed',1,8);


INSERT INTO `queryparameters_qrp` (`qrp_ID`, `qrp_qry_ID`, `qrp_Type`, `qrp_OptionSQL`, `qrp_Name`, `qrp_Description`, `qrp_Alias`, `qrp_Default`, `qrp_Required`, `qrp_InputBoxSize`, `qrp_Validation`, `qrp_NumericMax`, `qrp_NumericMin`, `qrp_AlphaMinLength`, `qrp_AlphaMaxLength`) VALUES
Expand Down

0 comments on commit 89f0e2a

Please sign in to comment.