OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

show both in event attendees list: will-attends and attended

Browse Source
This commit is contained in:
following 2013-05-13 17:22:47 +02:00
parent f94c2e60d4
commit 09b18ed86c
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/doc/sql/static-data/data.sql
View File

@ -2449,6 +2449,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2007', 'User da
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2008', 'OKAPI Applications', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2009', 'OKAPI Apps', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2040', 'Deleted text:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2041', 'total', '2013-04-25 23:00:00');
-- Table sys_trans_ref
SET NAMES 'utf8';
@ -6229,6 +6230,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2008', 'DE', 'API-Anwendungen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2009', 'DE', 'API-Anwendungen', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2040', 'DE', 'Gelöschter Text:', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2041', 'DE', 'insgesamt', '2013-04-25 23:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing – please do not login', '2010-08-28 11:48:07');

6
htdocs/event_attendance.php
View File

@ -28,7 +28,11 @@
sql_free_result($rs);
$rs = sql("SELECT DISTINCT `user`.`username` FROM `cache_logs` INNER JOIN `caches` ON `cache_logs`.`cache_id`=`caches`.`cache_id` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` INNER JOIN `user` ON `user`.`user_id`=`cache_logs`.`user_id` WHERE `cache_status`.`allow_user_view`=1 AND `cache_logs`.`type`=8 AND `cache_logs`.`cache_id`='&1' ORDER BY `user`.`username`", $cache_id);
$tpl->assign_rs('attendants', $rs);
$tpl->assign_rs('willattend', $rs);
sql_free_result($rs);
$rs = sql("SELECT DISTINCT `user`.`username` FROM `cache_logs` INNER JOIN `caches` ON `cache_logs`.`cache_id`=`caches`.`cache_id` INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id` INNER JOIN `user` ON `user`.`user_id`=`cache_logs`.`user_id` WHERE `cache_status`.`allow_user_view`=1 AND `cache_logs`.`type`=7 AND `cache_logs`.`cache_id`='&1' ORDER BY `user`.`username`", $cache_id);
$tpl->assign_rs('attended', $rs);
sql_free_result($rs);
}

13
htdocs/templates2/ocstyle/event_attendance.tpl
View File

@ -11,10 +11,17 @@
{t}by{/t} {$owner|escape}</p>
</div>
<div style="margin-top:16px;">
<p style="color: 5890a8"><b>{t}Attendees{/t}</b></p>
<p style="color: 5890a8">({t}Total{/t}: {count array=$attendants})</p>
<p>{foreach from=$attendants item=attendantsItem}
<p style="color: 5890a8"><b>{t}Will attend{/t}</b></p>
<p style="color: 5890a8">({t}total{/t}: {count array=$willattend})</p>
<p>{foreach from=$willattend item=attendantsItem}
{$attendantsItem.username|escape}<br />
{/foreach}</p>
<div style="margin-top:16px;">
<p style="color: 5890a8"><b>{t}Attended{/t}</b></p>
<p style="color: 5890a8">({t}total{/t}: {count array=$attended})</p>
<p>{foreach from=$attended item=attendantsItem}
{$attendantsItem.username|escape}<br />
{/foreach}</p>
</div>
</div>
</p>