Changeset 1329 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts

Timestamp:

04/29/15 20:24:15 (9 years ago)

Author:

nanardon

Message:

Merge branch 'jquery'

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts

Files:

• Web.pm (modified) (3 diffs)
• Web/Controller/Ajax.pm (modified) (2 diffs)
• Web/Controller/Json (added)
• Web/Controller/Json.pm (copied) (copied from trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Search/Adv.pm) (3 diffs)
• Web/Controller/Json/FreeIp.pm (added)
• Web/Controller/Json/RefVal.pm (added)
• Web/Controller/Search/Adv.pm (modified) (1 diff)
• Web/Model/AttrForms.pm (modified) (7 diffs)
• Web/Model/AttrFormsA.pm (added)
• Web/View/Json.pm (added)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm

@@ -51 +51 @@
     objects => {
         user => {
-            quick_search => [ qw(cn sn givenName) ],
+            quick_search => [ qw(cn sn givenName description) ],
             list => [ qw(sn givenName mail) ],
         },
@@ -59 +59 @@
         },
         nethost => {
-            quick_search => [ qw(cn description ip cname otherName) ],
+            quick_search => [ qw(cn description ip cname otherName macaddr serialNumber) ],
             list => [ qw(description owner) ],
         },
@@ -301 +301 @@
         related => {
             label => 'Voir aussi:',
+        },
+        SerialNumber => {
+            label => 'Numéro de série',
         },
     },

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm

@@ -51 +51 @@
     my $attribute = $c->model('Accounts')->db->attribute($otype, $attr) or return;
     $c->stash->{value} = $attribute->display($c->req->param('id'));
-}
-
-sub attrvalues : Local {
-    my ($self, $c, $otype, $attr) = @_;
-
-    my $base = $c->model('Accounts')->db;
-    my $val = $c->req->param('val') || '';
-    $c->stash->{values} = [
-        sort
-        grep { /^\Q$val\E/ } $base->attributes_summary($otype, $attr)
-    ];
-
 }
 
@@ -207 +195 @@
 }
 
-sub search_adv : Local {
-    my ($self, $c) = @_;
-    $c->stash->{db} = $c->model('Accounts')->db;
-    $c->stash->{otype} = $c->req->param('otype');
-}
-
 sub end : Private {
     my ( $self, $c ) = @_;

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json.pm

@@ -1 @@
-package LATMOS::Accounts::Web::Controller::Search::Adv;
+package LATMOS::Accounts::Web::Controller::Json;
 use Moose;
 use namespace::autoclean;
@@ -7 +7 @@
 =head1 NAME
 
-LATMOS::Accounts::Web::Controller::Search::Adv - Catalyst Controller
+LATMOS::Accounts::Web::Controller::Json - Catalyst Controller
 
 =head1 DESCRIPTION
@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    $c->stash->{db} = $c->model('Accounts')->db;
+    $c->response->body('Matched LATMOS::Accounts::Web::Controller::Json in Json.');
 }
 
+sub end : Private {
+    my ( $self, $c ) = @_;
+    $c->forward($c->view('Json'));
+}
+
+=encoding utf8
 
 =head1 AUTHOR

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Search/Adv.pm

@@ -26 +26 @@
 
     $c->stash->{db} = $c->model('Accounts')->db;
+
+    if ($c->req->param('otype')) {
+        $c->session->{searchOtype} = $c->req->param('otype');
+    } elsif ($c->req->param('attr')) {
+        push(@{$c->session->{searchValues}}, sprintf('%s~%s', $c->req->param('attr'), $c->req->param('attrval')));
+    } elsif ($c->req->param('delval')) {
+        my @delvals = $c->req->param('delval');
+        my @newvals = ();
+        foreach my $v (@{$c->session->{searchValues} || []}) {
+            grep { $_ eq $v } @delvals and next;
+            push(@newvals, $v);
+        }
+        $c->session->{searchValues} = \@newvals;
+    } elsif(grep { $_ && $_ eq 'new' } $c->req->query_keywords) {
+        $c->session->{searchOtype} = undef;
+        $c->session->{searchValues} = [];
+    }
+    
+    if ($c->session->{searchOtype}) {
+        $c->stash->{objs} = [ $c->stash->{db}->search_objects(
+            $c->session->{searchOtype},
+            @{ $c->session->{searchValues} || []},
+        ) ];
+    }
+
 }
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -97 +97 @@
             unexported
             description
+            facsimileTelephoneNumber
         ) ],
     },
@@ -217 +218 @@
     $new->{base} = $base || (ref $object ? $object->base : undef) or return $self;
     $new->{otype} = ref $object ? $object->type : $object;
+
+
+    foreach (@{ $forms->{$form}->{attrs} }) {
+        $new->{_attr}{$_} = $c->model('AttrFormsA', $_, ($object
+                ? ($object)
+                : ($base, $new->{otype})))
+            or die "Cannot get attribute $_";
+    }
+
     bless($new, __PACKAGE__);
 }
@@ -240 +250 @@
     grep { $self->base->attribute($self->otype, $_) }
     @{ $forms->{$self->{form}}->{attrs} };
-}
-
-sub attr_label {
-    my ($self, $attr, $label, $hint) = @_;
-    $label ||= '';
-    $hint ||= '';
-    LATMOS::Accounts::Web->config->{attrs} ||= {};
-    my $attribute = $self->base->attribute($self->otype, $attr);
-    my $htmlname = $self->escape($self->attr_field_name($attr));
-    if (my $attr_config = LATMOS::Accounts::Web->config->{attrs}{$attr}) {
-        $label ||= $attr_config->{label} || '';
-        #utf8::is_utf8($label) && utf8::encode($label);
-        $hint ||= $attr_config->{hint} || '';
-        #utf8::is_utf8($hint) && utf8::encode($hint);
-    }
-    return sprintf('<label %sfor="%s">%s</label>',
-        ($hint ? sprintf('title="%s"', $self->escape($hint)) : ''),
-        $self->escape($htmlname),
-        $self->escape($label || $attr),
-    );
-}
-
-sub attr_hint {
-    my ($self, $attr) = @_;
-    LATMOS::Accounts::Web->config->{attrs} ||= {};
-    if (my $attr_config = LATMOS::Accounts::Web->config->{attrs}{$attr}) {
-        return $attr_config->{hint} || '';
-    }
-    return;
-}
-
-sub attr_raw_value {
-    my ($self, $attribute) = @_;
-    my @val = grep { $_ }  
-        ($self->{c}->req->param($attribute->name))
-        || ($self->{object}
-            ? ($self->{object}->get_attributes($attribute->name))
-            : ());
-
-    if (@val) {
-        return @val;
-    } else {
-        return (grep { $_ } ($attribute->default_value))
-    }
-}
-
-sub attr_field_name {
-    my ($self, $attr) = @_;
-    my $id = $self->{object}
-        ? ($self->{object}->id || '')
-        : '';
-    $id .= '_' if ($id);
-    $id =~ s/\./_/g;
-    $id =~ s/-/_/g;
-    $id . $attr;
-}
-
-sub attr_item {
-    my ($self, $attribute, $value, $htmlid) = @_;
-
-    my $html = $self->_attr_item($attribute, $value, $htmlid);
-    
-    if ($attribute->uniq) {
-        $html .= qq|<span class="inputvalidate" id="${htmlid}_uniq"></span>|;
-    }
-    if (my $ref = $attribute->reference) {
-        my $uri_part = $self->_uri_part($ref);
-        if ($self->base->attribute($ref, 'displayName')) {
-            my $text = '';
-            if ($value &&
-                (my $obj = $self->base->get_object($ref, $value))) {
-                $text = $obj->get_attributes('displayName');
-            }
-            $html .= sprintf(
-                qq|<span id="${htmlid}_ref" style="margin-left: 1em">$text</span>|,
-                $self->escape($text),
-            );
-        } elsif($value && $uri_part) {
-            $html .= sprintf(
-                '<a href="%s"><img class="attr" src="%s" title="%s"></a>',
-                $self->{c}->uri_for('/', $uri_part, $value),
-                $self->{c}->uri_for('/static', 'images', 'arrow-right.png'),
-                $value,
-            );
-        }
-    }
-
-    $html
-}
-
-sub _attr_item {
-    my ($self, $attribute, $value, $htmlid) = @_;
-
-    my $htmlname = $self->escape($self->attr_field_name($attribute->name));
-    $htmlid ||= $htmlname;
-
-    for ($attribute->form_type) {
-            /^textarea$/i and do {
-                return sprintf(
-                    '<textarea id="%s" name="%s" cols="40">%s</textarea>',
-                    $self->escape($htmlid),
-                    $self->escape($htmlname),
-                    $self->escape($value || ''),
-                );
-                last;
-            };
-
-            /^label$/i and do {
-                $value or last;
-                my $html_field = $self->escape($value);
-                $html_field =~ s/\n/<br>/g;
-                $html_field .= sprintf('<input type="hidden" name="%s" value="%s">',
-                    $self->escape($htmlname), ($value || ''));
-                return $html_field;
-                last;
-            };
-
-            /^date$/i and do {
-                my ($date, $time) = split(/ /, $value || '');
-                if ($date && $date =~ /^(\d+)-(\d+)-(\d+)$/) {
-                    $date = "$3/$2/$1";
-                }
-                my $html = "\n" . q{<SCRIPT LANGUAGE="JavaScript" ID="js13">
-                var cal13 = new CalendarPopup();
-                </SCRIPT>} . "\n";
-                $html .= sprintf(
-                    '<input type="text" id="%s" name="%s" value="%s" size="12">',
-                    $self->escape($htmlid),
-                    $self->escape($htmlname),
-                    $self->escape($date)
-                );
-                $html .= q{<DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>};
-                $html .= qq|
-                <A HREF="#"
-                    onClick="cal13.select(document.getElementById('$htmlid'),'${htmlid}_anc','dd/MM/yyyy');return false;"
-                    TITLE="Date"
-                    NAME="${htmlid}_anc" ID="${htmlid}_anc">
-                    <img class="attr" src="| . $self->{c}->uri_for(qw(/static images view-calendar-day.png))
-                    . qq{" style="ref"></A>
-                    } . "\n";
-                return $html;
-                last;
-            };
-
-            /^checkbox/i and do {
-                my $options = $1 || '';
-                my $html = sprintf('<input type="checkbox" id="%s" name="%s"%s>',
-                    $htmlid,
-                    $self->escape($htmlname),
-                    $value ? '  checked="yes"' : ''
-                ); 
-                $html .= sprintf('<input type="hidden" name="%s">',
-                    $self->escape($htmlname));
-                if ($attribute->form_option('rawvalue')) {
-                    $html .= $value
-                        ? ' ' . $value
-                        : ''; 
-                }
-                return $html;
-                last;
-            };
-
-            /^LIST/i and do {
-                my $select = sprintf('<select id="%s" name="%s">',
-                    $self->escape($htmlid),
-                    $self->escape($htmlname)) . "\n";
-                $select .= '<option value="">--</option>' . "\n"
-                    unless($attribute->mandatory);
-                $value ||= '';
-                my $initial_observed = '';
-                my @valslist;
-                foreach my $val (sort $attribute->can_values) {
-                    push(@valslist, {
-                        val => $val,
-                        disp => $attribute->display($val || ''),
-                    });
-                }
-                foreach (sort { $a->{disp} cmp $b->{disp} } @valslist) {
-                    $select .= sprintf(
-                        '    <option value="%s"%s>%s</option>',
-                        $self->escape($_->{val} || ''),
-                        $value eq $_->{val} ? ' selected="selected"' : '',
-                        $self->escape($_->{disp} || ''),
-                    );
-                    $select .= "\n";
-                }
-                $select .= "</select>\n";
-
-                return $select;
-                last;
-            };
-
-            /^text/i and do {
-                return sprintf(
-                    '<input type="text" id="%s" name="%s" value="%s" size="%d">',
-                    $self->escape($htmlid),
-                    $self->escape($htmlname),
-                    $self->escape($value),
-                    $attribute->form_option('length') || 30,
-                );
-                last;
-            };
-        }
-    return '';
 }
 
@@ -458 +264 @@
 }
 
-sub attr_js {
-    my ($self, $attribute, $value, $htmlid) = @_;
-
-    my (@js);
-
-    if (my $ref = $attribute->reference) {
-        my $uri_part = $self->_uri_part($ref);
-        if ($self->base->attribute($ref, 'displayName')) {
-            push(@js, 
-                $self->{c}->prototype->observe_field( $htmlid,
-                    {
-                        update => "${htmlid}_ref",
-                        url => $self->{c}->uri_for('/ajax', 'rawattr', $ref),
-                        frequency => 1,
-                        with   => "'attr=displayName&id=' + element.options[element.selectedIndex].text",
-                    }
-                )
-            ) if ($attribute->form_type =~ /list/i);
-        }
-    }
-
-    if ($attribute->uniq) {
-        push(@js,
-            $self->{c}->prototype->observe_field( $htmlid,
-                {
-                    update => "${htmlid}_uniq",
-                    url => $self->{c}->uri_for('/ajax', 'objattrexist',
-                        $self->otype, $attribute->name),
-                    frequency => 1,
-                    with => "'val='+element.value" .
-                    ($self->{object} ?
-                        "+'&exclude=" . ($self->{object}->id || '') . "'" 
-                        : ''),
-                }
-            )
-        );
-    }
-
-    return(join("\n", @js));
+sub attr_label {
+    my ($self, $attr, $label, $hint) = @_;
+
+    if ($label) {
+        return $label;
+    } elsif (my $hash = LATMOS::Accounts::Web->config->{attrs}{$attr}) {
+        return $hash->{label};
+    } else {
+       retrun $attr;
+    } 
+}
+
+sub attr_hint {
+    my ($self, $attr) = @_;
+
+    $self->{_attr}{$attr}->attr_hint;
 }
 
@@ -502 +285 @@
     my ($self, $attr, $type) = @_;
 
-    my $attribute;
-    if ($type) {
-        if (ref $type) {
-            $attribute = $self->base->attribute(
-                $self->otype,
-                { %$type, name => $attr },
-            );
-        } else {
-            $attribute =  $self->base->attribute(
-                $self->otype,
-                { formtype => $type , name => $attr },
-            );
-        }
-    } else {
-        if ($self->{object}) {
-            $attribute = $self->{object}->attribute($attr);
-        } else {
-            $attribute = $self->base->attribute(
-                $self->otype, $attr,
-                { formtype => $type }
-            );
-        }
-    }
-    $attribute ||= $self->base->attribute($self->otype, { name => $attr });
-
-
-    my $htmlname = $self->escape($self->attr_field_name($attr));
-
-    my @html_fields;
-
-    # Force Array context:
-    my @attr_raw_value = ();
-
-    if ($attribute->multiple) {
-        @attr_raw_value = grep { $_ } $self->attr_raw_value($attribute);
-    } else {
-        my ($val) = $self->attr_raw_value($attribute);
-        @attr_raw_value = ($val || '');
-    }
-
-    foreach my $attr_raw_value (@attr_raw_value) {
-
-        my $html_id = $htmlname .
-            (scalar(@html_fields) ? scalar(@html_fields) : '');
-        push(@html_fields,
-            join("\n",
-                $self->attr_item(
-                    $attribute, $attr_raw_value, $html_id
-                ),
-                $self->attr_js(
-                    $attribute, $attr_raw_value, $html_id
-                )
-            )
-        );
-    }
-
-    if ($attribute->{multiple} && !$attribute->readonly) {
-        my $html_id = $htmlname . '_m_SUBID';
-
-        my $attr = $self->attr_item($attribute, '', $html_id);
-        # JS: string are on the line only
-        $attr =~ s/\n//mg;
-        $attr =~ s/'/\'/g;
-
-        my $js = $self->attr_js($attribute, '', 'NANAR');
-        $js =~ s!'NANAR([_\w]*)'!('$html_id$1'.replace(/SUBID/g, cn))!gm;
-        $js =~ s!<script[^>]+>!!gm;
-        $js =~ s!</script>!!gm;
-        $js =~ s!-->!!gm;
-        $js =~ s/<!--//gm;
-
-        my $addempty = sprintf('<div id="%s"></div>', "${htmlname}_div_0");
-        $addempty .= "\n";
-        $addempty .= sprintf(qq#
-            <script type="text/javascript">
-            var cn_${htmlname} = 0;
-            function add_${htmlname} () {
-            cn_${htmlname}++;
-            // It work only using temporary variable
-            var cn = cn_${htmlname};
-            document.getElementById('${htmlname}_div_' + (cn - 1)).innerHTML +=
-                '$attr'.replace(/SUBID/g, cn );
-            document.getElementById('${htmlname}_div_' + (cn - 1)).innerHTML +=
-                '<div id="${htmlname}_div_'+ cn +'" style="display:block"></div>';
-            %s
-            }
-            </script>
-            #, $js
-        );
-
-        $addempty .= "\n";
-        $addempty .=
-            qq|<button type="button" style="display:block" onclick="add_${htmlname}()">+</button>|,
-
-        push(@html_fields, $addempty);
-    }
-
-    return join("<br>\n", @html_fields);
-}
-
-sub submit {
-    my ($self) = @_;
-    return sprintf(
-        '<input type="submit" name="%s" value="Enregistrer">',
-        $self->escape($self->label),
-    );
-}
+    $self->{_attr}{$attr}->attr_field($type);
+}
+
 
 sub write_attributes {
     my ($self) = @_;
     my @attrs;
-    foreach ($self->attributes) {
-        my $attr = ($self->{object}
-            ? $self->{object}->attribute($_)
-            : $self->base->attribute($self->otype, $_)) or next;
-        $attr->readonly and next;
+    foreach (values %{ $self->{_attr} }) {
+        $_->readonly and next;
         push(@attrs, $_);
     }
@@ -626 +302 @@
     my ($self, $attrs) = @_;
     $self->{c}->req->param($self->label) || $attrs or return;
-    my $prefix = $self->attr_field_name('');
     my %fields;
     foreach ($attrs ? @{ $attrs } : $self->write_attributes) {
-        my $attr = ($self->{object}
-            ? $self->{object}->attribute($_)
-            : $self->base->attribute($self->otype, $_)) or next;
+        my $attr = ref $_ ? $_ : $self->{_attr}{$_};
         if ($attr->{multiple}) {
-            $fields{$_} = [ grep { $_ } $self->{c}->req->param("$prefix$_") ];
+            $fields{$attr->name} = [ grep { $_ } $self->{c}->req->param($attr->htmlname) ];
         } else {
-            $fields{$_} = $self->{c}->req->param("$prefix$_");
+            $fields{$attr->name} = $self->{c}->req->param($attr->htmlname);
         }
     }
@@ -647 +320 @@
 }
 
+sub submit {
+    my ($self) = @_;
+    return sprintf(
+        '<input type="submit" name="%s" value="Enregistrer">',
+        $self->escape($self->label),
+    );
+}
+
+
 =head1 AUTHOR