Changeset 1507 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

12/18/15 18:35:43 (9 years ago)

Author:

nanardon

Message:

Display full empty form when no employment exists

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm (modified) (3 diffs)

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

@@ -101 +101 @@
         /^employment$/ and do {
             $arg ||= $c->stash->{user}->get_attributes('currentEmployment');
+
+            $c->stash->{employment} = $base->get_object('employment', $arg);
+            $c->stash->{forme} = $c->model('AttrForms', 'employment',
+                $c->stash->{employment} ? $c->stash->{employment} : 'employment', $base);
+            $c->stash->{forme}->set_attrs if($c->stash->{employment});
+            $c->stash->{template} = 'users/employment.tt';
             if ($arg) {
                 if ($arg =~ m/^\@/) {
                     $c->stash->{newemployment} = 1;
-                    $c->stash->{forme} = $c->model('AttrForms', 'employment', 'employment', $base);
                     if ($arg =~ m/\@duplicate/i) {
                         my $oldempl = $c->model('Accounts')->db->get_object('employment', 
@@ -122 +127 @@
                     } elsif ($arg =~ m/\@create/i) {
 
-                        my $time = str2time($c->req->param('firstday'));
-                        my $lastd = DateTime->from_epoch( epoch => $time )
-                            ->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-
-                        my ($empl) = $c->stash->{user}->listEmployment;
-                        if ($empl) {
-                            my $obj = $c->model('Accounts')->db->get_object('employment', $empl);
-                            if (!$obj->get_attributes('lastday')) {
-                                $obj->set_c_fields(lastday => $lastd->subtract(days => 1)->ymd('-'));
-                            } 
+                        for (1) {
+                            my $time = str2time($c->req->param('firstday')) or last;
+                            my $lastd = DateTime->from_epoch( epoch => $time )
+                                ->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
+
+                            my ($empl) = $c->stash->{user}->listEmployment;
+                            if ($empl) {
+                                my $obj = $c->model('Accounts')->db->get_object('employment', $empl);
+                                if (!$obj->get_attributes('lastday')) {
+                                    $obj->set_c_fields(lastday => $lastd->subtract(days => 1)->ymd('-'));
+                                } 
+                            }
+
+                            my $id = $username . '-' . $lastd->ymd('-');
+                            $c->req->params->{user} = $username;
+                            if ($id = $c->stash->{forme}->set_attrs([ 'user',
+                                        map { $_->name } $c->stash->{forme}->write_attributes], $id)) {
+                                $c->res->redirect($c->uri_for('/users', $username, 'employment', $id));
+                                return 1;
+                            }
                         }
-
-                        my $id = $username . '-' . $lastd->ymd('-');
-                        $c->req->params->{user} = $username;
-                        if ($id = $c->stash->{forme}->set_attrs([ 'user',
-                                    map { $_->name } $c->stash->{forme}->write_attributes], $id)) {
-                            $c->res->redirect($c->uri_for('/users', $username, 'employment', $id));
-                            return 1;
-                        }
-                    }
-                } else {
-                    $c->stash->{employment} = $base->get_object('employment', $arg);
-                    $c->stash->{forme} = $c->model('AttrForms', 'employment', $c->stash->{employment});
-                    $c->stash->{forme}->set_attrs;
+                    }
                 }
             }
@@ -153 +156 @@
             }
             
-            $c->stash->{template} = 'users/employment.tt';
         };
         /^passwd$/ and do {