Changeset 959 for LATMOS-Accounts-Web

Timestamp:

05/15/12 03:30:21 (12 years ago)

Author:

nanardon

Message:

• merge all work around forms

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Request.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Web/Model/AttrFilter.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (7 diffs)
• root/html/includes/header.tt (modified) (2 diffs)
• root/html/request/default.tt (modified) (3 diffs)
• root/html/request/index.tt (modified) (1 diff)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Request.pm

@@ -54 +54 @@
     $c->stash->{datarequest} =
         LATMOS::Accounts::Bases::Sql::DataRequest->new($accreq);
+    $c->stash->{datarequest}->set_ptr_object($c->stash->{object})
+        if ($c->stash->{object});
+
     $c->stash->{form} = $c->model(
         'AttrForms',
         '',
-        $c->stash->{object},
+        $c->stash->{datarequest},
         $c->model('Accounts')->db
     );
+
+    # Default apply date:
+    my @date = localtime( time + 3600 * 24 );
+    $c->stash->{default_apply_date} = sprintf(
+        '%02d/%02d/%d',
+        @date[3,4],
+        $date[5] + 1900
+    );
+
+    if ($c->req->param('send')) {
+        my %attrs;
+        foreach ($c->stash->{datarequest}->attributes) {
+            my $htmlname = $c->stash->{form}->attr_field_name($_);
+            my @vals = $c->req->param($htmlname);
+            $attrs{$_} = @vals > 1 ? \@vals : $vals[0];
+        }
+        if ($c->stash->{datarequest}->register(
+            $c->user->{username},
+            $c->req->param('apply') || $c->stash->{default_apply_date},
+            %attrs,
+        )) {
+            $c->go('recorded');
+        }
+    }
+
 }
 
+sub recorded : Private {
+    my ($self, $c) = @_;
 
+    my %attrs = $c->stash->{datarequest}->get_values;
+    $c->stash->{values} = \%attrs;
+}
 
 =head1 AUTHOR

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm

@@ -91 +91 @@
 sub search_field {
     my ($self, $count) = @_;
-    my $form = $self->{c}->model('AttrForms');
+    my $form = $self->{c}->model('AttrForms', '', $self->otype, $self->{c}->stash->{db});
     my $html = '<select name="attr">
     <option value=""></option>';

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

@@ -216 +216 @@
 
 sub attr_label {
-    my ($self, $attr) = @_;
-    my ($hint, $label) = ('', '');
+    my ($self, $attr, $label, $hint) = @_;
+    $label ||= '';
+    $hint ||= '';
     LATMOS::Accounts::Web->config->{attrs} ||= {};
-    my $htmlname = ($self->{object} ? $self->{object}->id . '_' : '') . $attr;
+    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} || '';
+        $label ||= $attr_config->{label} || '';
         #utf8::is_utf8($label) && utf8::encode($label);
-        $hint = $attr_config->{hint} || '';
+        $hint ||= $attr_config->{hint} || '';
         #utf8::is_utf8($hint) && utf8::encode($hint);
     }
@@ -243 +245 @@
 
 sub attr_raw_value {
-    my ($self, $attr) = @_;
-    return $self->{c}->req->param($attr) ||
-        ($self->{object} ? $self->{object}->get_attributes($attr) : '')
+    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))
+    }
 }
 
@@ -251 +262 @@
     my ($self, $attr) = @_;
     my $id = $self->{object}
-        ? $self->{object}->id . '_'
+        ? ($self->{object}->id || '')
         : '';
+    $id .= '_' if ($id);
     $id =~ s/\./_/g;
     $id =~ s/-/_/g;
@@ -403 +415 @@
                 last;
             };
-
-            warn $_;
         }
     return '';
@@ -450 +460 @@
                     frequency => 1,
                     with => "'val='+element.value" .
-                    ($self->{object} ? "+'&exclude=" . $self->{object}->id . "'" :
-                        ''),
+                    ($self->{object} ?
+                        "+'&exclude=" . ($self->{object}->id || '') . "'" 
+                        : ''),
                 }
             )
@@ -463 +474 @@
     my ($self, $attr, $type) = @_;
 
-    my $attr_info = $type
-        ? { formtype => $type }
-        : undef;
-
-    my $attribute = ($self->{object}
-        ? $self->{object}->attribute($attr)
-        : $self->base->attribute($self->otype, $attr));
-
-    $attribute ||= $self->base->attribute(
-        $self->otype,
-        { 
-            name => $attr,
-            formtype => $type
-        },
-    );
+    my $attribute = ($type
+        ? ref $type
+            ? $self->base->attribute(
+                $self->otype,
+                { %$type, name => $attr },)
+            : $self->base->attribute(
+                $self->otype,
+                { formtype => $type , name => $attr },)
+        : ($self->{object}
+            ? $self->{object}->attribute($attr)
+            : $self->base->attribute($self->otype, $attr, { formtype => $type })))
+        || $self->base->attribute($self->otype, { name => $attr });
+
 
     my $htmlname = $self->escape($self->attr_field_name($attr));
 
     my @html_fields;
-    foreach my $attr_raw_value (
-        $attribute->multiple
-            ? (grep { $_ } $self->attr_raw_value($attr))
-            : $self->attr_raw_value($attr) || '') {
+
+    # 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 .
@@ -501 +517 @@
     }
 
-    if ($attribute->{multiple}) {
+    if ($attribute->{multiple} && !$attribute->readonly) {
         my $html_id = $htmlname . '_m_SUBID';
 

LATMOS-Accounts-Web/root/html/includes/header.tt

@@ -103 +103 @@
         </span>
         <span>
-            <a href="[% c.uri_for('/sites') %]"
-            onMouseOver="document.getElementById('menui').innerHTML='Liste des sites';"
-            onMouseOut="resetmenu();"
-            >
-            <img title="Sites" src="[% c.uri_for('/static', 'icons', 'xfce-internet.png') %]"></a>
-        </span>
-        [% # On cache volontairement les alias si l'utilisateur ne doit pas y
-        toucher %]
-        [% IF c.model('Accounts').db.check_acl('aliases', '@CREATE', 'w') %]
-        <span>
-            <a href="[% c.uri_for('/aliases') %]"
-            onMouseOver="document.getElementById('menui').innerHTML=
-                'Alias mail sans utilisateur';"
-            onMouseOut="resetmenu();"
-            >
-            <img title="Alias mail" src="[% c.uri_for('/static', 'icons', 'mail_forward.png') %]"></a>
-        </span>
-        [% END %]
-        <span>
             <a href="[% c.uri_for('/nethosts') %]"
             onMouseOver="document.getElementById('menui').innerHTML='Liste des hÎtes réseau';"
@@ -135 +116 @@
         [% END %]
         </span>
-        [% # On cache volontaire les zones si l'utilisateur ne doit pas y
-        toucher %]
-        [% IF c.model('Accounts').db.check_acl('netzone', '@CREATE', 'w') %]
         <span>
-            <a href="[% c.uri_for('/netzones') %]"
-            onMouseOver="document.getElementById('menui').innerHTML='Liste des zones réseaux';"
+            <a href="[% c.uri_for('/request') %]"
+            onMouseOver="document.getElementById('menui').innerHTML='Demandes';"
             onMouseOut="resetmenu();"
             >
-            <img title="Gestion Réseau" src="[% c.uri_for('/static', 'icons', 'network-workgroup.png') %]"></a>
-            <a href="[% c.uri_for('/create', 'netzone') %]"
-            onMouseOver="document.getElementById('menui').innerHTML='Ajouter une zones réseau';"
+            <img title="Demandes" src="[% c.uri_for('/static', 'icons', 'logviewer.png') %]"></a>
+        </span>
+        <span>
+            <a href="[% c.uri_for('/admin') %]"
+            onMouseOver="document.getElementById('menui').innerHTML='Administrer...';"
             onMouseOut="resetmenu();"
-            ><img title="Ajouter une zone" src="[% c.uri_for('/static', 'icons', 'add.png') %]"></a>
+            >
+            <img title="Administrer..." src="[% c.uri_for('/static', 'icons', 'gtk-execute.png') %]"></a>
         </span>
-        [% END %]
         <span>
             <a href="[% c.uri_for('/about') %]"

LATMOS-Accounts-Web/root/html/request/default.tt

@@ -1 +1 @@
 <!-- $Id$ -->
+
+<h2>[% accreq.get_attributes('description') | html %]</h2>
 
 [% IF select_object %]
@@ -25 +27 @@
 [% ELSE %]
 
+[% IF accreq.get_attributes('requireObject') %]
+<h3>[% datarequest.get_attributes('displayName') || datarequest.id %]</h3>
+[% END %]
+
 <form action="[% c.uri_for('/request', accreq.id, object.id) %]">
 [% FOREACH attr = datarequest.attributes %]
@@ -31 +37 @@
 [% END %]
 <tr>
-<th>[% form.attr_label(attr) %]</th>
+[% attrinfo = datarequest.attribute_info(attr) %]
+<th>[% form.attr_label(attr, attrinfo.label) %]</th>
 <td>[% form.attr_field(attr) %]</td>
 </tr>
 [% IF loop.last %]
-
+<tr>
+<th>Date d'application</th>
+<td>
+[% form.attr_field('apply', { formtype => 'date', _noacl => 1, default => default_apply_date } ) %]
+</td>
+</tr>
+<tr><td></td><td>
+<input type="submit" name="send">
+</td></tr>
 </table>
 [% END %]
 [% END %]
-[% form.attr_field('apply', 'DATE') %]
-<input type="submit" name="send">
 </form>
 

LATMOS-Accounts-Web/root/html/request/index.tt

@@ -1 +1 @@
 <!-- $Id$ -->
 
+<h2>Formuler une demande:</h2>
+
 [% FOREACH h = c.model('Accounts').db.search_objects('accreq', 'exported=*') %]
+[% IF loop.first %]
+<ul>
+[% END %]
 [% o = c.model('Accounts').db.get_object('accreq', h) %]
+<li>
 <a href="[% c.uri_for(h) %]">
 [% o.get_attributes('description') || o.id | html %]
 </a>
-<br>
-
+</li>
+[% IF loop.last %]
+</ul>
 [% END %]
+[% END %]