Projekt

Obecné

Profil

« Předchozí | Další » 

Revize a33fa7cc

Přidáno uživatelem Michal Kliment před asi 9 roky(ů)

Release 1.1.2

Zobrazit rozdíly:

application/controllers/stats.php
->type('date')
->default(Filter_form::OPER_GREATER_OR_EQUAL, $association->entrance_date)
->default(Filter_form::OPER_SMALLER_OR_EQUAL, $last_entrance_date)
->class('without_days');
->add_class('without_days');
$filter_form->add('increase')
->type('number');
......
$view->content = new View('stats/members_increase_decrease');
$view->content->js_data_array_str = '';
$year = min(array_keys($counts));
$month = min(array_keys($counts[$year]));
$max_year = max(array_keys($counts));
$max_month = max(array_keys($counts[$max_year]));
$year = $max_year = $month = $max_month = NULL;
$counts_year_keys = array_keys($counts);
if (!empty($counts_year_keys))
{
$year = min($counts_year_keys);
$max_year = max($counts_year_keys);
$counts_month_keys = array_keys($counts[$year]);
if (!empty($counts_month_keys))
{
$month = min(array_keys($counts[$year]));
$max_month = max(array_keys($counts[$max_year]));
}
}
$max_date = date('Y-m-d', mktime(
0, 0, 0, $max_month, count(date::days($max_month)), $max_year
));
application/vendors/deb/freenetis/changelog
freenetis (1.1.2) stable; urgency=hight
* Fix release
* Fixes #868: member statistics on no filtered results
* Fixes #869: datepicker in SMS messages date filter
* Fixes #871: dialog loading in IE7
* Fixes #873: invalid rebuilding of filter
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 04 Feb 2014 22:21:11 +0100
freenetis (1.1.1) stable; urgency=hight
* Fix release (#862: Activation of user notification message)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Fri, 24 Jan 2014 18:45:31 +0100
application/views/filter_form_template.php
* @author Michal Kliment
*/
$(".t").die("change").live("change", function (){
// css classes
var classes = [];
// filter items
var $op = $(this).parent().find("select.o");
var $val = $(this).parent().find(":input.v");console.log($val.length);
// value
var val = $(this).val();
var name = $val.attr("name");
// remove all items from operation's select
$(this).next().html("");
$op.html("");
// adds only operations of current type
var b = [];
for (var i in types[$(this).val()]['operations'])
for (var i in types[val]['operations'])
{
b.push("<option value='"+i+"'>"+types[$(this).val()]['operations'][i]+"</option>");
b.push("<option value='"+i+"'>"+types[val]['operations'][i]+"</option>");
}
$(this).next().append(b.join(''));
$op.append(b.join(''));
$(this).next().next().autocomplete("destroy");
// destroy old objects
$val.autocomplete("destroy");
$val.datepicker("destroy");
$(this).next().next().datepicker("destroy");
// repair classes of value input
$(this).next().next().removeClass().addClass("v");
for (var i in types[$(this).val()]['classes'])
{
$(this).next().next().addClass(types[$(this).val()]['classes'][i]);
}
// add CSS classes
for (var i in types[$(this).val()]['css_classes'])
{
$(this).next().next().addClass(types[$(this).val()]['css_classes'][i]);
classes.push(types[$(this).val()]['css_classes'][i]);
}
// remove old CSS classes
$val.removeClass();
// type returns key (not value), change value input to select
if (types[$(this).val()]['returns'] == 'key')
if (types[val]['returns'] == 'key')
{
if (!$(this).next().next().is("select"))
if (!$val.is("select"))
{
// adds button to switch to multiple select
$(this).next().next().after("<img src='<?php echo url::base() ?>media/images/icons/ico_add.gif' class='expand-button' title='<?php echo __("Multiple choice") ?>'>");
$val.after($("<img>", {
src: "<?php echo url::base() ?>media/images/icons/ico_add.gif",
title: "<?php echo __("Multiple choice") ?>"
}).addClass("expand-button"));
}
classes.push('v');
$(this).next().next().replaceWith("<select class='" + classes.join(' ') + "' name='"+$(this).next().next().attr("name")+"'></select>");
b = [];
for (var i in types[$(this).val()]['values'])
// build select
b = ["<select name='" + name + "' class='v'>"];
for (var i in types[val]['values'])
{
b.push("<option value='"+i+"'>"+types[$(this).val()]['values'][i]+"</option>");
b.push("<option value='"+i+"'>"+types[val]['values'][i]+"</option>");
}
$(this).next().next().append(b.join(''));
b.push("</select>");
// replace old input with select
$val.replaceWith(b.join(""));
// replace pointer to value
$val = $(this).parent().find(":input.v");
}
// type returns value (not key), change value select to input
else
{
if (!$(this).next().next().is("input"))
if (!$val.is("input"))
{
classes.push('v');
$(this).next().next().replaceWith("<input class='" + classes.join(' ') + "' name='"+$(this).next().next().attr("name")+"'>");
$(this).next().next().next().remove();
$val.next().remove(); // expand button remove
$val.replaceWith($("<input>", {name: name}).addClass('v'));
// replace pointer to value
$val = $(this).parent().find(":input.v");
}
else
{
$val.val("");
}
}
// set CSS classes
$val.addClass('v')
.addClass(types[val]['classes'].join(' '))
.addClass(types[val]['css_classes'].join(' '));
// type has callback
if (types[$(this).val()]['callback'] != null)
if (types[val]['callback'] != null)
{
$(this).next().next().autocomplete({
source: "<?php echo url_lang::base() ?>"+types[$(this).val()]['callback']
$val.autocomplete({
source: "<?php echo url_lang::base() ?>"+types[val]['callback']
});
}
});
application/views/js/base.php
if (data.length)
{
// detecting returned data's type by first character
switch (data[0])
switch (data.charAt(0))
{
// result is html
case '<':
version.php
* The current version of FreenetIS.
* This value must be changed by developers in a new release of FreenetIS.
*/
define('FREENETIS_VERSION', '1.1.1');
define('FREENETIS_VERSION', '1.1.2');

Také k dispozici: Unified diff