Skip to content

Commit 1e51703

Browse files
AlexanderBlanchardACAlexanderBlanchardAC
committed
DIS-51: refactor: Remove Unneeded Code
1 parent b05351f commit 1e51703

File tree

3 files changed

+2
-185
lines changed

3 files changed

+2
-185
lines changed

‎code/web/services/MyAccount/MyCampaigns.php

+2-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class MyCampaigns extends MyAccount {
1111
function launch() {
1212
global $interface;
1313
global $library;
14-
// require_once ROOT_DIR . '/sys/CommunityEngagement/Campaign.php';
1514

1615
$campaign = new Campaign();
1716
//Get User
@@ -74,7 +73,6 @@ function getCampaigns() {
7473
$campaign->rewardExists = $rewardDetails['rewardExists'];
7574
}
7675

77-
// if ($campaign->enrolled) {
7876
//Fetch milestones for this campaign
7977
$milestones = CampaignMilestone::getMilestoneByCampaign($campaignId);
8078
$completedMilestonesCount = 0;
@@ -97,18 +95,8 @@ function getCampaigns() {
9795
$milestone->completedGoals = $milestoneProgress['completed'];
9896
$milestone->totalGoals = CampaignMilestone::getMilestoneGoalCountByCampaign($campaignId, $milestoneId);
9997
$milestone->progressData = $progressData;
100-
// $milestone->rewardName = CampaignMilestone::getMilestoneRewardByCampaignId($campaignId, $milestoneId);
101-
102-
//Get completed milestones for user
103-
// $completedMilestones = UserCompletedMilestone::getCompletedMilestones($userId, $campaignId);
104-
// foreach ($completedMilestones as $completedMilestone) {
105-
// if ($completedMilestone->milestoneId == $milestoneId) {
106-
// $completedMilestonesCount++;
107-
// }
108-
// }
98+
10999
}
110-
//Add completed milestones count to campaign object
111-
// $campaign->numCompletedMilestones = $completedMilestonesCount;
112100
$campaign->numCampaignMilestones = $numCampaignMilestones;
113101

114102
$userCampaign = new UserCampaign();
@@ -121,16 +109,14 @@ function getCampaigns() {
121109
$campaign->milestones = $milestones;
122110

123111
//Add the campaign to the list
124-
// }
112+
125113
$campaignList[] = clone $campaign;
126114
}
127115
return $campaignList;
128116
}
129117

130118

131119

132-
//TODO:: Write a function that uses the milestone id for each progress bar to use the ce_milestone_progress_entries table and
133-
//get information about which books were checked out and count towards the milestone.
134120
function getBreadcrumbs(): array
135121
{
136122
$breadcrumbs = [];

‎code/web/sys/CommunityEngagement/Campaign.php

-78
Original file line numberDiff line numberDiff line change
@@ -513,74 +513,6 @@ public static function getUserInfo($userId) {
513513
}
514514

515515

516-
// public function getPastCampaigns(int $userId): array {
517-
// $campaign = new Campaign();
518-
// $currentDate = date('Y-m-d H:i:s');
519-
520-
// $campaign->whereAdd("endDate < '$currentDate'");
521-
// $pastCampaignList = [];
522-
523-
// if ($campaign->find()) {
524-
// while($campaign->fetch()) {
525-
// $pastCampaignList[$campaign->id] = clone $campaign;
526-
527-
// //Fetch campaign reward
528-
// $reward = new Reward();
529-
// $reward->id = $campaign->campaignReward;
530-
// if ($reward->find(true)) {
531-
// $pastCampaignList[$campaign->id]->rewardName = $reward->name;
532-
// }
533-
534-
// //Fetch campaign milestones
535-
// $campaignId = $campaign->id;
536-
// $milestones = CampaignMilestone::getMilestoneByCampaign($campaignId);
537-
// $pastCampaignList[$campaign->id]->milestones = $milestones;
538-
539-
540-
// //check if user is enrolled
541-
// $pastCampaignList[$campaign->id]->enrolled = $campaign->isUserEnrolled($userId);
542-
543-
544-
// foreach ($pastCampaignList[$campaign->id]->milestones as $milestone) {
545-
// $milestoneReward = new Reward();
546-
// $milestoneReward->id = $milestone->rewardId;
547-
// if ($milestoneReward->find(true)) {
548-
// $milestone->rewardName = $milestoneReward->name;
549-
// } else {
550-
// $milestone->rewardName = null;
551-
// }
552-
// }
553-
554-
// //If user is enrolled, fetch their progress for each milestone
555-
// if ($pastCampaignList[$campaign->id]->enrolled) {
556-
// $userCampaign = new UserCampaign();
557-
// $userCampaign->userId = $userId;
558-
// $userCampaign->campaignId = $campaign->id;
559-
560-
// if ($userCampaign->find(true)) {
561-
// $milestoneCompletionStatus = $userCampaign->checkMilestoneCompletionStatus();
562-
// $pastCampaignList[$campaign->id]->campaignRewardGiven = (int)$userCampaign->rewardGiven;
563-
564-
// foreach ($pastCampaignList[$campaign->id]->milestones as $milestone) {
565-
// $milestone->userProgress = MilestoneUsersProgress::getProgressByMilestoneId($milestone->id, $userId);
566-
// $milestone->isComplete = $milestoneCompletionStatus[$milestone->id] ?? false;
567-
// $milestone->rewardGiven = MilestoneUsersProgress::getRewardGivenForMilestone($milestone->id, $userId);
568-
// $reward->id = $milestone->rewardId;
569-
// // if($reward->find(true)) {
570-
// // $milestone->rewardName = $reward->name;
571-
// // } else {
572-
// // $milestone->rewardName = null;
573-
// // }
574-
// }
575-
// }
576-
// }
577-
// // $milestoneRewards = self::getMilestoneRewards($campaignId, $userId);
578-
// // $pastCampaignList[$campaign->id]->milestoneRewards = $milestoneRewards;
579-
// }
580-
// }
581-
// return $pastCampaignList;
582-
// }
583-
584516
public function getPastCampaigns(int $userId): array {
585517
$campaign = new Campaign();
586518
$currentDate = date('Y-m-d H:i:s');
@@ -607,16 +539,6 @@ public function getPastCampaigns(int $userId): array {
607539

608540
// Fetch campaign milestones and their rewards using mapping
609541
$milestones = CampaignMilestone::getMilestoneByCampaign($campaign->id);
610-
// foreach ($milestones as $milestone) {
611-
// $milestoneReward = new Reward();
612-
// $milestoneReward->id = $milestone->campaignReward;
613-
// if ($milestoneReward->find(true)) {
614-
// $milestone->rewardName = $milestoneReward->name;
615-
// $milestone->rewardType = $milestone->rewardType;
616-
// $milestone->rewardImage = $milestoneReward->getDisplayUrl();
617-
// $milestone->rewardExists = !empty($milestoneReward->badgeImage);
618-
// }
619-
// }
620542
$pastCampaignList[$campaign->id]->milestones = $milestones;
621543

622544
// Check if user is enrolled

‎code/web/sys/CommunityEngagement/Milestone.php

-91
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,8 @@ public static function getObjectStructure($context = ''): array {
5353
'author_display' => 'Author',
5454
'subject_facet' => 'Subject',
5555
'user_list' => 'List (id)',
56-
// 'hold_title' => 'Title',
57-
// 'hold_author' => 'Author',
58-
// 'list_id' => 'List Name',
59-
// 'list_name' => 'List Length',
60-
// 'work_id' => 'Reviewed Title',
61-
// 'work_author' => 'Reviewed Author',
6256
],
6357
'required' => false,
64-
// var_dump($groupedWorkDriver->getSolrField('format_category_main')); #Books, eBooks, Audiobooks, Music, Video
65-
// var_dump($groupedWorkDriver->getSolrField('publisherStr'));
66-
// var_dump($groupedWorkDriver->getSolrField('title_display'));
67-
// var_dump($groupedWorkDriver->getSolrField('topic_facet'));
68-
// var_dump($groupedWorkDriver->getSolrField('placeOfPublication'));
69-
// var_dump($groupedWorkDriver->getSolrField('publishDate'));
70-
// var_dump($groupedWorkDriver->getSolrField('owning_library_main'));
71-
// var_dump($groupedWorkDriver->getSolrField('lc_subject'));
72-
// var_dump($groupedWorkDriver->getSolrField('subject_facet'));
73-
// var_dump($groupedWorkDriver->getSolrField('itype_main'));
74-
// var_dump($groupedWorkDriver->getSolrField('format_main'));
75-
// var_dump($groupedWorkDriver->getSolrField('language'));
76-
// var_dump($groupedWorkDriver->getSolrField('auth_author2')); #contributors
77-
// var_dump($groupedWorkDriver->getSolrField('author_display')); #main author
7858
],
7959
'conditionalOperator' => [
8060
'property' => 'conditionalOperator',
@@ -98,27 +78,6 @@ public static function getObjectStructure($context = ''): array {
9878
return $structure;
9979
}
10080

101-
public static function getConditionalFields() {
102-
$conditionalFields = [
103-
'user_checkout' => [
104-
['value' => 'title', 'label' => 'Title'],
105-
['value' => 'author', 'label' => 'Author'],
106-
],
107-
'user_hold' => [
108-
['value' => 'hold_title', 'label' => 'Title'],
109-
['value' => 'hold_author', 'label' => 'Author'],
110-
],
111-
'user_list' => [
112-
['value' => 'list_id', 'label' => 'List Name'],
113-
['value' => 'list_name', 'label' => 'List Length'],
114-
],
115-
'user_work_review' => [
116-
['value' => 'work_id', 'label' => 'Reviewed Title'],
117-
['value' => 'work_author', 'label' => 'Reviewed Author'],
118-
],
119-
];
120-
return $conditionalFields;
121-
}
12281

12382
/**
12483
* @return array
@@ -135,53 +94,3 @@ public static function getMilestoneList(): array {
13594
return $milestoneList;
13695
}
13796
}
138-
139-
// $conditionalFields = Milestone::getConditionalFields();
140-
/*?>
141-
<script>
142-
var conditionalFields = <?php echo json_encode($conditionalFields); ?>
143-
144-
function updateConditionalField(milestoneType) {
145-
// Get the dropdown element for conditional fields
146-
var conditionalFieldDropdown = document.querySelector('[name="conditionalField"]');
147-
148-
// Clear existing options in the dropdown
149-
conditionalFieldDropdown.innerHTML = '';
150-
151-
// Check if milestoneType has conditional fields
152-
var options = conditionalFields[milestoneType] || [];
153-
154-
// If no options are available
155-
if (options.length === 0) {
156-
var noOption = document.createElement('option');
157-
noOption.value = '';
158-
noOption.text = 'No conditional fields available';
159-
conditionalFieldDropdown.appendChild(noOption);
160-
return;
161-
}
162-
163-
// Populate new options
164-
options.forEach(function(option) {
165-
var newOption = document.createElement('option');
166-
newOption.value = option.value;
167-
newOption.text = option.label;
168-
conditionalFieldDropdown.appendChild(newOption);
169-
});
170-
}
171-
172-
// Trigger dropdown update when the page loads or the milestoneType is changed
173-
document.addEventListener('DOMContentLoaded', function() {
174-
var milestoneTypeDropdown = document.querySelector('[name="milestoneType"]');
175-
176-
if(milestoneTypeDropdown) {
177-
milestoneTypeDropdown.addEventListener('change', function() {
178-
updateConditionalField(this.value);
179-
});
180-
updateConditionalField(milestoneTypeDropdown.value);
181-
182-
} else {
183-
console.error("Milestone type dropdown not found.");
184-
}
185-
});
186-
187-
</script>*/

0 commit comments

Comments
 (0)