Skip to content

Commit 8b74c0e

Browse files
ankush-maherwalankush-maherwal
authored
Merge pull request #165 from ManasiBadave/tjnotificationerror
create tjnotification menu shwing error in FE
2 parents 031031e + 0fa54e9 commit 8b74c0e

File tree

6 files changed

+44
-29
lines changed

6 files changed

+44
-29
lines changed

‎src/com_tjnotifications/admin/models/notification.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,9 @@ public function save($data)
427427
$this->deleteBackendConfigs($backendConfigIdsToBeDeleted);
428428

429429
// 2.3 Common data for saving
430-
$createdOn = !empty($data['created_on']) ? $data['created_on'] : '';
431-
$updatedOn = !empty($data['updated_on']) ? $data['updated_on'] : '';
430+
$null = Factory::getDbo()->getNullDate();
431+
$createdOn = !empty($data['created_on']) ? $data['created_on'] : $null;
432+
$updatedOn = !empty($data['updated_on']) ? $data['updated_on'] : $null;
432433

433434
// 2.4 try saving all backend specific configs
434435
// This has repeatable data eg: $data['email']['emailfields'] or $data['sms']['smsfields']

‎src/com_tjnotifications/media/css/tjnotifcations.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,13 @@
44

55
.table-wrap{table-layout: fixed; width: 100%; white-space: initial;}
66
.wrap{word-wrap: break-word; white-space: initial; overflow: hidden;}
7+
8+
.radio-btns>.btn:not(:last-child):not(.dropdown-toggle) {
9+
margin-left: 5px!important;
10+
}
11+
.radio-btns>:not(.btn-check:first-child)+.btn {
12+
margin-left: 5px!important;
13+
}
14+
.radio-btns>input {
15+
margin-left: 10px;
16+
}

‎src/com_tjnotifications/media/css/tjnotifcations.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/com_tjnotifications/site/models/preferences.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,10 @@ public function adminPreferences($provider)
249249
$query = $db->getQuery(true);
250250
$provider = strtolower($provider);
251251
$query->select('client,`key`');
252-
$query->from($db->quoteName('#__tj_notification_templates'));
253-
$query->where($db->quoteName($provider . '_status') . '=' . $db->quote('1'));
254-
252+
$query->from($db->quoteName('#__tj_notification_templates','tnt'));
253+
$query->join('INNER', $db->qn('#__tj_notification_template_configs', 'tntc') . ' ON (' . $db->qn('tntc.template_id') . ' = ' . $db->qn('tnt.id') . ')');
254+
$query->where($db->quoteName('tntc.backend') . '=' . $db->quote($provider));
255+
$query->where($db->quoteName('tntc.state') . '=' . $db->quote('1'));
255256
$db->setQuery($query);
256257

257258
return $db->loadObjectList();

‎src/com_tjnotifications/site/views/preferences/tmpl/default_bs5.php‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
$language = Factory::getLanguage();
1919
$language->load('com_tjnotification', JPATH_SITE, 'en-GB', true);
2020
$language->load('com_tjnotification', JPATH_SITE, null, true);
21-
21+
HTMLHelper::_('stylesheet','media/com_tjnotifications/css/tjnotifcations.css');
2222
HTMLHelper::_('script', '/jquery.min.js');
23+
HTMLHelper::_('script','https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js');
2324
Factory::getDocument()->addScriptDeclaration('
2425
const tjnBaseurl = "' . Uri::root() . '";
2526
jQuery.noConflict();
@@ -119,11 +120,11 @@ function removePreferance(pId,client,provider,key)
119120
</div>
120121

121122
<div id="display_info"></div>
122-
<ul class="nav nav-pills" id="myTab" role="tablist">
123+
<ul class="nav nav-tabs" id="myTab" role="tablist">
123124
<?php if (!empty($this->clients)) : ?>
124125
<?php foreach ($this->clients as $i => $menu) :?>
125126
<li class="nav-item" role="presentation">
126-
<button type="button" id="<?php echo($menu->client) . '-tab'; ?>" role="tab" data-bs-target="#<?php echo($menu->client); ?>" class="nav-link <?php echo ($i == 0) ? ' active ' : ''?>">
127+
<button type="button" id="<?php echo($menu->client) . '-tab'; ?>" role="tab" data-bs-target="#<?php echo($menu->client); ?>" data-bs-toggle="tab" class="nav-link <?php echo ($i == 0) ? ' active ' : ''?>">
127128
<?php echo str_replace("com_","",$menu->client); ?>
128129
</button>
129130
</li>
@@ -133,7 +134,7 @@ function removePreferance(pId,client,provider,key)
133134

134135
<div class="tab-content">
135136
<?php foreach ($this->clients as $i => $menu) :?>
136-
<div class="tab-pane fade <?php echo ($i == 0) ? ' active ' : ''?>" id="<?php echo($menu->client); ?>">
137+
<div role="tabpanel" class="tab-pane fade <?php echo ($i == 0) ? ' active show' : ''?>" id="<?php echo($menu->client);?>">
137138
<table class="table table-striped table-hover">
138139
<thead>
139140
<tr>
@@ -167,11 +168,12 @@ function removePreferance(pId,client,provider,key)
167168
<?php if (empty($this->preferences)) : ?>
168169

169170
<div class="control">
170-
<fieldset class="btn-group btn-group-yesno radio pull-left">
171-
<input type="radio" id="<?php echo $value.$i; ?>" name="prefer" value="1" onclick="removePreferance('<?php echo $value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" checked="checked" />
172-
<input type="radio" id="<?php echo $key.$i; ?>" name="prefer1" value="0" onclick="addPreferance('<?php echo $value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" />
173-
<label class="btn-success" for="<?php echo $value.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_ENABLE'); ?></label>
174-
<label class="btn" for="<?php echo $key.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_DISABLE'); ?></label>
171+
<fieldset class="btn-group radio-btns btn-group-yesno radio pull-left">
172+
<input type="radio" id="<?php echo $key.$i; ?>" name="prefer1" value="0" onclick="addPreferance('<?php echo $value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" />
173+
<label class="btn btn-success" for="<?php echo $value.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_ENABLE'); ?></label>
174+
175+
<input type="radio" id="<?php echo $value.$i; ?>" name="prefer1" value="1" onclick="removePreferance('<?php echo $value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" checked="checked" />
176+
<label class="btn btn-danger" for="<?php echo $key.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_DISABLE'); ?></label>
175177
</fieldset>
176178
</div>
177179

@@ -183,23 +185,26 @@ function removePreferance(pId,client,provider,key)
183185
<?php if ($prefer->client == $menu->client && $prefer->key == $value && $prefer->provider == $head->provider) : ?>
184186
<?php $count++; ?>
185187
<div class="control">
186-
<fieldset class="btn-group btn-group-yesno radio pull-left">
187-
<input type="radio" id="<?php echo $menu->client.$value.$i; ?>" name="prefer" value="1" onclick="removePreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" />
188-
<input type="radio" id="<?php echo $menu->client.$key.$i; ?>" name="prefer1" value="0" onclick="addPreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" checked="checked" />
189-
<label class="btn" for="<?php echo $menu->client.$value.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_ENABLE'); ?></label>
190-
<label class="btn-danger" for="<?php echo $menu->client.$key.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_DISABLE'); ?></label>
188+
<fieldset class="btn-group radio-btns btn-group-yesno radio pull-left">
189+
<input type="radio" id="<?php echo $menu->client.$key.$i; ?>" name="prefer2" value="0" onclick="addPreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" checked="checked" />
190+
<label class="btn btn-success" for="<?php echo $menu->client.$value.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_ENABLE'); ?></label>
191+
192+
<input type="radio" id="<?php echo $menu->client.$value.$i; ?>" name="prefer2" value="1" onclick="removePreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" />
193+
<label class="btn btn-danger" for="<?php echo $menu->client.$key.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_DISABLE'); ?></label>
191194
</fieldset>
192195
</div>
193196
<?php endif;?>
194197
<?php endforeach; ?>
195198

196199
<?php if ($count==0): ?>
197200
<div class="control">
198-
<fieldset class="btn-group btn-group-yesno radio pull-left">
199-
<input type="radio" id="<?php echo $menu->client.$value.$i; ?>" name="prefer" value="1" onclick="removePreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" checked="checked" />
200-
<input type="radio" id="<?php echo $menu->client.$key.$i; ?>" name="prefer1" value="0" onclick="addPreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" />
201-
<label class="btn-success" for="<?php echo $menu->client.$value.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_ENABLE'); ?></label>
202-
<label class="btn" for="<?php echo $menu->client.$key.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_DISABLE'); ?></label>
201+
<fieldset class="btn-group radio-btns btn-group-yesno radio pull-left">
202+
<input type="radio" id="<?php echo $menu->client.$key.$i; ?>" name="prefer3" value="0" onclick="addPreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" />
203+
<label class="btn btn-success" for="<?php echo $menu->client.$value.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_ENABLE'); ?></label>
204+
<input type="radio" id="<?php echo $menu->client.$value.$i; ?>" name="prefer3" value="1" onclick="removePreferance('<?php echo $menu->client.$value.$i; ?>','<?php echo($menu->client); ?>','<?php echo($head->provider); ?>','<?php echo $value; ?>')" checked="checked" />
205+
<label class="btn btn-danger" for="<?php echo $menu->client.$key.$i; ?>"><?php echo Text::_('COM_TJNOTIFICATION_VIEWS_PREFERENCES_FIELD_DISABLE'); ?></label>
206+
207+
203208
</fieldset>
204209
</div>
205210
<?php endif; ?>

‎src/com_tjnotifications/site/views/preferences/view.html.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,13 @@ public function display($tpl = null)
5050

5151
$this->preferences = $this->get('States');
5252
$model = ListModel::getInstance('Providers', 'TJNotificationsModel');
53-
5453
$this->providers = $model->getProvider();
55-
56-
$model = $this->getModel();
54+
$modelPreferences = ListModel::getInstance('Preferences', 'TJNotificationsModel');
5755

5856
for ($i = 0;$i < count($this->providers); $i++)
5957
{
60-
$this->adminPreferences[$this->providers[$i]->provider] = $model->adminPreferences($this->providers[$i]->provider);
58+
$this->adminPreferences[$this->providers[$i]->provider] = $modelPreferences->adminPreferences($this->providers[$i]->provider);
6159
}
62-
6360
parent::display($tpl);
6461
}
6562
else

0 commit comments

Comments
 (0)