View | Details | Raw Unified | Return to bug 31562
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-4 / +4 lines)
Lines 802-826 OPAC: Link Here
802
            - pref: PatronSelfModificationMandatoryField
802
            - pref: PatronSelfModificationMandatoryField
803
              type: modalselect
803
              type: modalselect
804
              source: borrowers
804
              source: borrowers
805
              exclusions: password|cardnumber|dateexpiry|categorycode|sort1|sort2|opacnote|borrowernotes
805
              exclusions: password|cardnumber|dateexpiry|categorycode|sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost
806
        -
806
        -
807
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
807
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
808
            - pref: PatronSelfRegistrationBorrowerMandatoryField
808
            - pref: PatronSelfRegistrationBorrowerMandatoryField
809
              type: modalselect
809
              type: modalselect
810
              source: borrowers
810
              source: borrowers
811
              exclusions: sort1|sort2|opacnote|borrowernotes
811
              exclusions: sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost
812
        -
812
        -
813
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
813
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
814
            - pref: PatronSelfRegistrationBorrowerUnwantedField
814
            - pref: PatronSelfRegistrationBorrowerUnwantedField
815
              type: modalselect
815
              type: modalselect
816
              source: borrowers
816
              source: borrowers
817
              exclusions: branchcode|sort1|sort2
817
              exclusions: branchcode|sort1|sort2|gonenoaddress|lost
818
        -
818
        -
819
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
819
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
820
            - pref: PatronSelfModificationBorrowerUnwantedField
820
            - pref: PatronSelfModificationBorrowerUnwantedField
821
              type: modalselect
821
              type: modalselect
822
              source: borrowers
822
              source: borrowers
823
              exclusions: sort1|sort2
823
              exclusions: sort1|sort2|gonenoaddress|lost
824
        -
824
        -
825
            - "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):"
825
            - "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):"
826
            - pref: PatronSelfRegistrationAdditionalInstructions
826
            - pref: PatronSelfRegistrationAdditionalInstructions
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-15 / +56 lines)
Lines 1288-1325 legend:hover { Link Here
1288
                                [% END # UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %]
1288
                                [% END # UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %]
1289
1289
1290
                                <!--this zones are not necessary in modif mode -->
1290
                                <!--this zones are not necessary in modif mode -->
1291
                                [% UNLESS ( opadd || opduplicate ) %]
1291
                                [% UNLESS ( opadd || opduplicate || ( nogonenoaddress && nolost ) ) %]
1292
                                    <fieldset class="rows" id="memberentry_account_flags">
1292
                                    <fieldset class="rows" id="memberentry_account_flags">
1293
                                        <legend id="account_flags_lgd">Patron account flags</legend>
1293
                                        <legend id="account_flags_lgd">Patron account flags</legend>
1294
                                        <ol class="radio">
1294
                                        <ol class="radio">
1295
                                            [% FOREACH flagloo IN flagloop %]
1295
                                            [% UNLESS nogonenoaddress %]
1296
                                                <li>
1296
                                                <li>
1297
                                                    <label class="radio" for="yes[% flagloo.name | html %]">
1297
                                                    [% IF mandatorygonenoaddress %]
1298
                                                        [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %]
1298
                                                        <label class="radio required" for="yesgonenoaddress">
1299
                                                        [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
1299
                                                    [% ELSE %]
1300
                                                        <label class="radio" for="yesgonenoaddress">
1301
                                                    [% END %]
1302
                                                        Gone no address:
1300
                                                    </label>
1303
                                                    </label>
1301
                                                    [% IF CAN_user_circulate_manage_restrictions %]
1304
                                                    [% IF CAN_user_circulate_manage_restrictions %]
1302
                                                        <label for="yes[% flagloo.name | html %]">
1305
                                                        <label for="yesgonenoaddress">
1303
                                                            [% IF ( flagloo.yes ) %]
1306
                                                            [% IF ( borrower_data.gonenoaddress ) %]
1304
                                                                <input type="radio" id="yes[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="1" checked="checked" />
1307
                                                                <input type="radio" id="yesgonenoaddress" name="gonenoaddress" value="1" checked="checked" />
1305
                                                            [% ELSE %]
1308
                                                            [% ELSE %]
1306
                                                                <input type="radio" id="yes[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="1" />
1309
                                                                <input type="radio" id="yesgonenoaddress" name="gonenoaddress" value="1" />
1307
                                                            [% END %]
1310
                                                            [% END %]
1308
                                                                Yes
1311
                                                                Yes
1309
                                                        </label>
1312
                                                        </label>
1310
                                                        <label for="no[% flagloo.name | html %]">
1313
                                                        <label for="nogonenoaddress">
1311
                                                            [% IF ( flagloo.no ) %]
1314
                                                            [% IF ( borrower_data.gonenoaddress ) %]
1312
                                                                <input type="radio" id="no[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="0" checked="checked"/>
1315
                                                                <input type="radio" id="nogonenoaddress" name="gonenoaddress" value="0" />
1313
                                                            [% ELSE %]
1316
                                                            [% ELSE %]
1314
                                                                <input type="radio" id="no[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="0" />
1317
                                                                <input type="radio" id="nogonenoaddress" name="gonenoaddress" value="0" checked="checked"/>
1315
                                                            [% END %]
1318
                                                            [% END %]
1316
                                                                No
1319
                                                                No
1317
                                                        </label>
1320
                                                        </label>
1318
                                                    [% ELSE %]
1321
                                                    [% ELSE %]
1319
                                                        [% IF flagloo.yes %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
1322
                                                        [% IF borrower_data.gonenoaddress %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
1320
                                                    [% END # /IF CAN_user_circulate_manage_restrictions %]
1323
                                                    [% END # /IF CAN_user_circulate_manage_restrictions %]
1324
                                                    [% IF mandatorygonenoaddress %]
1325
                                                        <span class="required">Required</span>
1326
                                                    [% END %]
1327
                                                </li>
1328
1329
                                            [% END # /UNLESS nogonenoaddress %]
1330
                                            [% UNLESS nolost %]
1331
                                                <li>
1332
                                                    [% IF mandatorylost %]
1333
                                                        <label class="radio required" for="yeslost">
1334
                                                    [% ELSE %]
1335
                                                        <label class="radio" for="yeslost">
1336
                                                    [% END %]
1337
                                                        Lost card:
1338
                                                    </label>
1339
                                                    [% IF CAN_user_circulate_manage_restrictions %]
1340
                                                        <label for="yeslost">
1341
                                                            [% IF ( borrower_data.lost ) %]
1342
                                                                <input type="radio" id="yeslost" name="lost" value="1" checked="checked" />
1343
                                                            [% ELSE %]
1344
                                                                <input type="radio" id="yeslost" name="lost" value="1" />
1345
                                                            [% END %]
1346
                                                                Yes
1347
                                                        </label>
1348
                                                        <label for="nolost">
1349
                                                            [% IF ( borrower_data.lost ) %]
1350
                                                                <input type="radio" id="nolost" name="lost" value="0" />
1351
                                                            [% ELSE %]
1352
                                                                <input type="radio" id="nolost" name="lost" value="0" checked="checked"/>
1353
                                                            [% END %]
1354
                                                                No
1355
                                                        </label>
1356
                                                    [% ELSE %]
1357
                                                        [% IF borrower_data.lost %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
1358
                                                    [% END # /IF CAN_user_circulate_manage_restrictions %]
1359
                                                    [% IF mandatorylost %]
1360
                                                        <span class="required">Required</span>
1361
                                                    [% END %]
1321
                                                </li>
1362
                                                </li>
1322
                                            [% END # /FOREACH flagloo %]
1363
                                            [% END # /UNLESS nogonenoaddress %]
1323
                                        </ol>
1364
                                        </ol>
1324
                                    </fieldset> <!-- /#memberentry_account_flags -->
1365
                                    </fieldset> <!-- /#memberentry_account_flags -->
1325
1366
(-)a/members/memberentry.pl (-25 lines)
Lines 724-752 while (@relationships) { Link Here
724
  push(@relshipdata, \%row);
724
  push(@relshipdata, \%row);
725
}
725
}
726
726
727
my %flags = (
728
    'gonenoaddress' => ['gonenoaddress'],
729
    'lost'          => ['lost']
730
);
731
732
my @flagdata;
733
foreach ( keys(%flags) ) {
734
    my $key = $_;
735
    my %row = (
736
        'key'  => $key,
737
        'name' => $flags{$key}[0]
738
    );
739
    if ( $data{$key} ) {
740
        $row{'yes'} = ' checked';
741
        $row{'no'}  = '';
742
    }
743
    else {
744
        $row{'yes'} = '';
745
        $row{'no'}  = ' checked';
746
    }
747
    push @flagdata, \%row;
748
}
749
750
# get Branch Loop
727
# get Branch Loop
751
# in modify mod: userbranch value comes from borrowers table
728
# in modify mod: userbranch value comes from borrowers table
752
# in add    mod: userbranch value comes from branches table (ip correspondence)
729
# in add    mod: userbranch value comes from branches table (ip correspondence)
Lines 839-845 $template->param( Link Here
839
  borrowernumber  => $borrowernumber, #register number
816
  borrowernumber  => $borrowernumber, #register number
840
  relshiploop => \@relshipdata,
817
  relshiploop => \@relshipdata,
841
  btitle=> $default_borrowertitle,
818
  btitle=> $default_borrowertitle,
842
  flagloop  => \@flagdata,
843
  category_type =>$category_type,
819
  category_type =>$category_type,
844
  modify          => $modify,
820
  modify          => $modify,
845
  nok     => $nok,#flag to know if an error
821
  nok     => $nok,#flag to know if an error
846
- 

Return to bug 31562