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

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+20 lines)
Lines 2969-2971 fieldset.rows + fieldset.action { Link Here
2969
.yui-u .rows li p label.widelabel {
2969
.yui-u .rows li p label.widelabel {
2970
    width: auto;
2970
    width: auto;
2971
}
2971
}
2972
2973
#dashboard td {
2974
    text-align: left;
2975
}
2976
2977
.dashboardleftpane {
2978
    margin-left: 1em;
2979
    margin-bottom: 1em;
2980
    float: left;
2981
}
2982
2983
.dashboardrightpane {
2984
    margin-right: 1em;
2985
    margin-bottom: 1em;
2986
    float: right;
2987
}
2988
2989
.dashboardempty {
2990
    background-color: #E8E8E8;
2991
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-110 / +100 lines)
Lines 166-171 Link Here
166
166
167
            [% END %]
167
            [% END %]
168
168
169
            <!-- Dashboard, if on -->
170
            [% IF DashBoardDisplayed %]
171
                [% UNLESS nofile %]
172
                    <fieldset id="dashboard" class="rows">
173
                        <legend>Koha library dashboard</legend>
174
                        <div class="dashboardleftpane">
175
                            <table id="overview" width="400">
176
                                <tr>
177
                                    <th>Overview</th>
178
                                    <th>System</th>
179
                                    <th>My Library</th>
180
                                </tr>
181
                                <tr align="left">
182
                                    <td align="left">Number of Biblios</td>
183
                                    <td>[% number_of_biblios %]</td>
184
                                    <td class="dashboardempty"></td>
185
                                </tr>
186
                                <tr>
187
                                    <td>Biblios added in last 7 days</td>
188
                                    <td>[% biblios_7days %]</td>
189
                                    <td class="dashboardempty"></td>
190
                                </tr>
191
                                <tr>
192
                                    <td>Number of Items</td>
193
                                    <td>[% items_system %]</td>
194
                                    <td>[% items_library %]</td>
195
                                </tr>
196
                                <tr>
197
                                    <td>Number of items added in last 7 days</td>
198
                                    <td> [% items_7days_system %]</td>
199
                                    <td>[% items_7days_system %]</td>
200
                                </tr>
201
                                <tr>
202
                                    <td>Registered Borrowers</td>
203
                                    <td>[% borrowers_system %]</td>
204
                                    <td>[% borrowers_library %]</td>
205
                                </tr>
206
                                <tr>
207
                                    <td>Expired Borrowers</td>
208
                                    <td>[% expired_borrowers_system %]</td>
209
                                    <td>[% expired_borrowers_library %]</td>
210
                                </tr>
211
                                <tr>
212
                                    <td>&nbsp;</td>
213
                                    <td></td>
214
                                    <td></td>
215
                                </tr>
216
                            </table>
217
                            Last updated: [% last_updated %]
218
                        </div>
219
                        <div class="dashboardrightpane">
220
                            <table id="circulation" width="400">
221
                                <tr>
222
                                    <th>Circulation</th>
223
                                    <th>System</th>
224
                                    <th>My Library</th>
225
                                </tr>
226
                                <tr>
227
                                    <td>Items on Loan</td>
228
                                    <td>[% issues_system %]</td>
229
                                    <td>[% issues_library %]</td>
230
                                </tr>
231
                                <tr>
232
                                    <td>Loan History</td>
233
                                    <td>[% loan_history_system %]</td>
234
                                    <td>[% loan_history_library %]</td>
235
                                </tr>
236
                                <tr>
237
                                    <td>Items Overdue</td>
238
                                    <td>[% overdues_system %]</td>
239
                                    <td>[% overdues_library %]</td>
240
                                </tr>
241
                                <tr>
242
                                    <td>Overdue within 7 days</td>
243
                                    <td>[% overdues_7days_system %]</td>
244
                                    <td>[% overdues_7days_library %]</td>
245
                                </tr>
246
                                <tr>
247
                                    <td>Overdue 8-14 days</td>
248
                                    <td>[% overdues_14days_system %]</td>
249
                                    <td>[% overdues_14days_library %]</td>
250
                                </tr>
251
                                <tr>
252
                                    <td>Overdue 15-21 days</td>
253
                                    <td>[% overdues_21days_system %]</td>
254
                                    <td>[% overdues_21days_library %]</td>
255
                                </tr>
256
                                <tr>
257
                                    <td>Very Overdue Items</td>
258
                                    <td>[% very_overdue_system %]</td>
259
                                    <td>[% very_overdue_library %]</td>
260
                                </tr>
261
                            </table>
262
                        </div>
263
                    </fieldset>
264
                [% ELSE %]
265
                    <b>Dashboard is set to "Show." However there is no XML file to read. Have you run it at least once?</b>
266
                [% END %]
267
            [% END %] <!-- End dashboard -->
268
169
</div>
269
</div>
170
            [% IF ( IntranetmainUserblock ) %]
270
            [% IF ( IntranetmainUserblock ) %]
171
                <div class="yui-g" id="area-userblock">
271
                <div class="yui-g" id="area-userblock">
Lines 196-312 Link Here
196
        </div><!-- /koha-news -->
296
        </div><!-- /koha-news -->
197
    [% END %]
297
    [% END %]
198
298
199
<!-- Dashboard, if on -->
200
[% IF DashBoardDisplayed %]
201
[% UNLESS nofile %]
202
<fieldset class="rows">
203
<legend>Koha Library Dashboard</legend>
204
    <table style="border:0px;" id="dashboard">
205
     <tr style="border-bottom: 0px;border-left: 0px;">
206
     <td style="border-left: 0px;border-bottom: 0px;">
207
	<table id="overview" width="400">
208
           <tr>
209
               <th>Overview</th>
210
              <th>System</th>
211
                <th>My Library</th>
212
            </tr>
213
          <tr align="left">
214
              <td align="left">Number of Biblios
215
             </td>
216
          <td>[% number_of_biblios %]</td>
217
               <td style="background-color:#E8E8E8"></td>
218
         </tr>
219
          <tr>
220
               <td>Biblios added in last 7 days</td>
221
          <td>[% biblios_7days %]</td>
222
           <td style="background-color:#E8E8E8"></td>
223
         </tr>
224
          <tr>
225
               <td>Number of Items</td>
226
               <td>[% items_system %]</td>
227
            <td>[% items_library %]</td>
228
       </tr>
229
          <tr>
230
               <td>Number of items added in last 7 days</td>
231
          <td> [% items_7days_system %]</td>
232
             <td>[% items_7days_system %]</td>
233
          </tr>
234
          <tr>
235
               <td>Registered Borrowers</td>
236
          <td>[% borrowers_system %]</td>
237
                <td>[% borrowers_library %]</td>
238
           </tr>
239
          <tr>
240
               <td>Expired Borrowers</td>
241
             <td>[% expired_borrowers_system %]</td>
242
                <td>[% expired_borrowers_library %]</td>
243
           </tr>
244
          <tr>
245
           <td>&nbsp;</td>
246
        <td></td>
247
      <td></td>
248
      </tr>
249
250
     </table>
251
       Last updated: [% last_updated %]
252
       </td>
253
  <td style="border-bottom: 0px;border-left: 0px;">
254
	
255
    <table id="circulation" width="400">
256
       <tr>
257
               <th>Circulation</th>
258
           <th>System</th>
259
                <th>My Library</th>
260
            </tr>
261
          <tr align="left">
262
              <td align="left">Items on Loan
263
         </td>
264
          <td>[% issues_system %]</td>
265
           <td>[% issues_library %]</td>
266
      </tr>
267
          <tr>
268
               <td>Loan History</td>
269
          <td>[% loan_history_system %]</td>
270
             <td>[% loan_history_library %]</td>
271
        </tr>
272
          <tr>
273
               <td>Items Overdue</td>
274
         <td>[% overdues_system %]</td>
275
         <td>[% overdues_library %]</td>
276
            </tr>
277
          <tr>
278
               <td>Overdue within 7 days</td>
279
         <td>[% overdues_7days_system %]</td>
280
           <td>[% overdues_7days_library %]</td>
281
      </tr>
282
          <tr>
283
               <td>Overdue 8-14 days</td>
284
             <td>[% overdues_14days_system %]</td>
285
          <td>[% overdues_14days_library %]</td>
286
     </tr>
287
           <tr>
288
              <td>Overdue 15-21 days</td>
289
            <td>[% overdues_21days_system %]</td>
290
          <td>[% overdues_21days_library %]</td>
291
     </tr>
292
           <tr>
293
              <td>Very Overdue Items</td>
294
            <td>[% very_overdue_system %]</td>
295
             <td>[% very_overdue_library %]</td>
296
        </tr>
297
      </table>
298
       </td>
299
    </tr>
300
    </table>
301
</fieldset>
302
</div>
303
</div>
304
</div>
299
</div>
305
[% END %]
306
[% END %]
307
[% IF nofile %]
308
<b>[% nofile %]</b>
309
[% END %]
310
</div>
300
</div>
311
301
312
[% MACRO jsinclude BLOCK %]
302
[% MACRO jsinclude BLOCK %]
(-)a/mainpage.pl (-154 / +149 lines)
Lines 92-268 unless ($loggedinuser) { Link Here
92
}
92
}
93
93
94
# Dashboard (If on in SysPref)
94
# Dashboard (If on in SysPref)
95
my $nofile = "Dashboard is set to \"ON\". However there is no XML file to read. Have you run it at least once?";
96
if ( C4::Context->preference('DashBoardDisplayed') )
95
if ( C4::Context->preference('DashBoardDisplayed') )
97
    {
96
    {
98
    my $koha_conf = $ENV{'KOHA_CONF'};
97
    my $koha_conf = $ENV{'KOHA_CONF'};
99
    my ($base,$file) = $koha_conf =~ m|^(.*[/\\])([^/\\]+?)$|;
98
    my ($base,$file) = $koha_conf =~ m|^(.*[/\\])([^/\\]+?)$|;
100
    my $xml_read = "dashboard_xml.out";
99
    my $xml_read = "dashboard_xml.out";
101
    my $xml_file = "$base"."$xml_read";
100
    my $xml_file = "$base"."$xml_read";
102
if (-e $xml_file) {
101
    if (-e $xml_file) {
103
    my $xml = new XML::Simple;
102
        my $xml = new XML::Simple;
104
    my $dash = $xml->XMLin($xml_file);
103
        my $dash = $xml->XMLin($xml_file);
105
    my $login_branch_name = $template->{VARS}{LoginBranchcode};
104
        my $login_branch_name = $template->{VARS}{LoginBranchcode};
106
    my $number_of_biblios;
105
        my $number_of_biblios;
107
    my $biblios_7days;
106
        my $biblios_7days;
108
    my $items_7days_system;
107
        my $items_7days_system;
109
    my $items_7days_library;
108
        my $items_7days_library;
110
    my $borrowers_system;
109
        my $borrowers_system;
111
    my $expired_borrowers_library;
110
        my $expired_borrowers_library;
112
    my $expired_borrowers_system;
111
        my $expired_borrowers_system;
113
    my $loan_history_system;
112
        my $loan_history_system;
114
    my $loan_history_library;
113
        my $loan_history_library;
115
    my $overdues_library;
114
        my $overdues_library;
116
    my $overdues_system;
115
        my $overdues_system;
117
    my $overdues_7days_library;
116
        my $overdues_7days_library;
118
    my $overdues_7days_system;
117
        my $overdues_7days_system;
119
    my $overdues_14days_library;
118
        my $overdues_14days_library;
120
    my $overdues_14days_system;
119
        my $overdues_14days_system;
121
    my $overdues_21days_library;
120
        my $overdues_21days_library;
122
    my $overdues_21days_system;
121
        my $overdues_21days_system;
123
    my $very_overdue_library;
122
        my $very_overdue_library;
124
    my $very_overdue_system;
123
        my $very_overdue_system;
125
    my $borrowers_library;
124
        my $borrowers_library;
126
    my $issues_library;
125
        my $issues_library;
127
    my $issues_system;
126
        my $issues_system;
128
    my $items_library;
127
        my $items_library;
129
    my $items_system;
128
        my $items_system;
130
    my $last_updated;
129
        my $last_updated;
131
130
132
            $number_of_biblios          = $dash->{biblios}->{NumberOfBiblios};
131
        $number_of_biblios          = $dash->{biblios}->{NumberOfBiblios};
133
            $biblios_7days              = $dash->{biblio_7days}->{NumberOfBiblio7Days};
132
        $biblios_7days              = $dash->{biblio_7days}->{NumberOfBiblio7Days};
134
            $items_7days_system         = $dash->{items_7days_system}->{NumberOfItems7Days};
133
        $items_7days_system         = $dash->{items_7days_system}->{NumberOfItems7Days};
135
            $borrowers_system           = $dash->{number_of_borrowers_system}->{NumberofBorrowersSystem};
134
        $borrowers_system           = $dash->{number_of_borrowers_system}->{NumberofBorrowersSystem};
136
            $loan_history_system        = $dash->{loan_history_system}->{NumberOfLoans};
135
        $loan_history_system        = $dash->{loan_history_system}->{NumberOfLoans};
137
            $items_system               = $dash->{items_system}->{NumberOfItemsSystem};
136
        $items_system               = $dash->{items_system}->{NumberOfItemsSystem};
138
            $expired_borrowers_system   = $dash->{expired_borrowers_system}->{ExpiredBorrowers};
137
        $expired_borrowers_system   = $dash->{expired_borrowers_system}->{ExpiredBorrowers};
139
            $issues_system              = $dash->{issues_system}->{NumberOfIssuesSystem};
138
        $issues_system              = $dash->{issues_system}->{NumberOfIssuesSystem};
140
            $overdues_system            = $dash->{overdues_system}->{NumberOfOverdues};
139
        $overdues_system            = $dash->{overdues_system}->{NumberOfOverdues};
141
            $overdues_7days_system      = $dash->{overdues_7days_system}->{NumberOfOverdues};
140
        $overdues_7days_system      = $dash->{overdues_7days_system}->{NumberOfOverdues};
142
            $overdues_14days_system     = $dash->{overdues_14days_system}->{NumberOfOverdues14Days};
141
        $overdues_14days_system     = $dash->{overdues_14days_system}->{NumberOfOverdues14Days};
143
            $overdues_21days_system     = $dash->{overdues_21days_system}->{NumberOfOverdues21Days};
142
        $overdues_21days_system     = $dash->{overdues_21days_system}->{NumberOfOverdues21Days};
144
            $very_overdue_system        = $dash->{very_overdue_system}->{Overdues};
143
        $very_overdue_system        = $dash->{very_overdue_system}->{Overdues};
145
            $last_updated               = $dash->{last_updated}->{UpdatedTime};
144
        $last_updated               = $dash->{last_updated}->{UpdatedTime};
146
145
147
# Looping for "logged in branch" dependant data
146
# Looping for "logged in branch" dependant data
148
            foreach my $numissl(@{$dash->{issues_library}})
147
        foreach my $numissl(@{$dash->{issues_library}})
149
                {
148
        {
150
                    if($numissl->{BranchCode} eq $login_branch_name)
149
            if($numissl->{BranchCode} eq $login_branch_name)
151
                        {
150
            {
152
                          $issues_library = $numissl->{NumberOfIssues}
151
                $issues_library = $numissl->{NumberOfIssues}
153
                        }
152
            }
154
                }
153
        }
155
            foreach my $numitm(@{$dash->{items_library}})
154
        foreach my $numitm(@{$dash->{items_library}})
156
                {
155
        {
157
                    if($numitm->{BranchCode} eq $login_branch_name)
156
            if($numitm->{BranchCode} eq $login_branch_name)
158
                        {
157
            {
159
                            $items_library = $numitm->{NumberOfItems}
158
                $items_library = $numitm->{NumberOfItems}
160
                        }
159
            }
161
                 }
160
        }
162
            foreach my $numbor(@{$dash->{borrowers_library}})
161
        foreach my $numbor(@{$dash->{borrowers_library}})
163
                {
162
        {
164
                    if($numbor->{BranchCode} eq $login_branch_name)
163
            if($numbor->{BranchCode} eq $login_branch_name)
165
                        {
164
            {
166
                            $borrowers_library = $numbor->{NumberOfBorrowers}
165
                $borrowers_library = $numbor->{NumberOfBorrowers}
167
                        }
166
            }
168
                 }
167
        }
169
            foreach my $numex(@{$dash->{expired_borrowers_library}})
168
        foreach my $numex(@{$dash->{expired_borrowers_library}})
170
                {
169
        {
171
                    if($numex->{BranchCode} eq $login_branch_name)
170
            if($numex->{BranchCode} eq $login_branch_name)
172
                        {
171
            {
173
                            $expired_borrowers_library = $numex->{ExpiredBorrowers}
172
                $expired_borrowers_library = $numex->{ExpiredBorrowers}
174
                        }
173
            }
175
                 }
174
        }
176
177
            foreach my $numitm7(@{$dash->{items_7days_library}})
178
                {
179
                    if($numitm7->{BranchCode} eq $login_branch_name)
180
                        {
181
                            $items_7days_library = $numitm7->{NumberOfItems7DaysLibrary}
182
                        }
183
                 }
184
185
            foreach my $oldiss(@{$dash->{loan_history_library}})
186
                {
187
                    if($oldiss->{BranchCode} eq $login_branch_name)
188
                        {
189
                            $loan_history_library = $oldiss->{NumberOfLoans}
190
                        }
191
                 }
192
193
            foreach my $ovdlib(@{$dash->{overdues_library}})
194
                {
195
                    if($ovdlib->{BranchCode} eq $login_branch_name)
196
                        {
197
                            $overdues_library = $ovdlib->{NumberOfOverdues}
198
                        }
199
                 }
200
175
201
            foreach my $ovd7day(@{$dash->{overdues_7days_library}})
176
        foreach my $numitm7(@{$dash->{items_7days_library}})
202
                {
177
        {
203
                    if($ovd7day->{BranchCode} eq $login_branch_name)
178
            if($numitm7->{BranchCode} eq $login_branch_name)
204
                        {
179
            {
205
                            $overdues_7days_library = $ovd7day->{NumberOfOverdues7Days}
180
                $items_7days_library = $numitm7->{NumberOfItems7DaysLibrary}
206
                        }
181
            }
207
                 }
182
        }
208
183
209
            foreach my $ovd14day(@{$dash->{overdues_14days_library}})
184
        foreach my $oldiss(@{$dash->{loan_history_library}})
210
                {
185
        {
211
                    if($ovd14day->{BranchCode} eq $login_branch_name)
186
            if($oldiss->{BranchCode} eq $login_branch_name)
212
                        {
187
            {
213
                            $overdues_14days_library = $ovd14day->{NumberOfOverdues14Days}
188
                $loan_history_library = $oldiss->{NumberOfLoans}
214
                        }
189
            }
215
                 }
190
        }
216
191
217
            foreach my $ovd21day(@{$dash->{overdues_21days_library}})
192
        foreach my $ovdlib(@{$dash->{overdues_library}})
218
                {
193
        {
219
                    if($ovd21day->{BranchCode} eq $login_branch_name)
194
            if($ovdlib->{BranchCode} eq $login_branch_name)
220
                        {
195
            {
221
                            $overdues_21days_library = $ovd21day->{NumberOfOverdues21Days}
196
                $overdues_library = $ovdlib->{NumberOfOverdues}
222
                        }
197
            }
223
                 }
198
        }
224
199
225
            foreach my $vryod(@{$dash->{very_overdue_library}})
200
        foreach my $ovd7day(@{$dash->{overdues_7days_library}})
226
                {
201
        {
227
                    if($vryod->{BranchCode} eq $login_branch_name)
202
            if($ovd7day->{BranchCode} eq $login_branch_name)
228
                        {
203
            {
229
                            $very_overdue_library = $vryod->{NumberOfVeryOverdue}
204
                $overdues_7days_library = $ovd7day->{NumberOfOverdues7Days}
230
                        }
205
            }
231
                 }
206
        }
232
207
233
        $template->param('number_of_biblios'            => $number_of_biblios,
208
        foreach my $ovd14day(@{$dash->{overdues_14days_library}})
234
                         'biblios_7days'                => $biblios_7days,
209
        {
235
                         'items_7days_system'           => $items_7days_system,
210
            if($ovd14day->{BranchCode} eq $login_branch_name)
236
                         'items_7days_library'          => $items_7days_library,
211
            {
237
                         'borrowers_system'             => $borrowers_system,
212
                $overdues_14days_library = $ovd14day->{NumberOfOverdues14Days}
238
                         'expired_borrowers_library'    => $expired_borrowers_library,
213
            }
239
                         'expired_borrowers_system'     => $expired_borrowers_system,
214
        }
240
                         'overdues_library'             => $overdues_library,
241
                         'overdues_system'              => $overdues_system,
242
                         'overdues_7days_library'       => $overdues_7days_library,
243
                         'overdues_7days_system'        => $overdues_7days_system,
244
                         'overdues_14days_library'      => $overdues_14days_library,
245
                         'overdues_14days_system'       => $overdues_14days_system,
246
                         'overdues_21days_library'      => $overdues_21days_library,
247
                         'overdues_21days_system'       => $overdues_21days_system,
248
                         'very_overdue_library'         => $very_overdue_library,
249
                         'very_overdue_system'          => $very_overdue_system,
250
                         'loan_history_system'          => $loan_history_system,
251
                         'loan_history_library'         => $loan_history_library,
252
                         'issues_library'               => $issues_library,
253
                         'issues_system'                => $issues_system,
254
                         'items_library'                => $items_library,
255
                         'items_system'                 => $items_system,
256
                         'borrowers_library'            => $borrowers_library,
257
                         'last_updated'                 => $last_updated
258
215
259
        );
216
        foreach my $ovd21day(@{$dash->{overdues_21days_library}})
260
}
217
        {
218
            if($ovd21day->{BranchCode} eq $login_branch_name)
219
            {
220
                $overdues_21days_library = $ovd21day->{NumberOfOverdues21Days}
221
            }
222
        }
261
223
262
elsif(!-e $xml_file) {
224
        foreach my $vryod(@{$dash->{very_overdue_library}})
263
 $template->param('nofile' => $nofile,);
225
        {
226
            if($vryod->{BranchCode} eq $login_branch_name)
227
            {
228
                $very_overdue_library = $vryod->{NumberOfVeryOverdue}
229
            }
264
        }
230
        }
265
231
232
        $template->param('number_of_biblios'   => $number_of_biblios,
233
                'biblios_7days'                => $biblios_7days,
234
                'items_7days_system'           => $items_7days_system,
235
                'items_7days_library'          => $items_7days_library,
236
                'borrowers_system'             => $borrowers_system,
237
                'expired_borrowers_library'    => $expired_borrowers_library,
238
                'expired_borrowers_system'     => $expired_borrowers_system,
239
                'overdues_library'             => $overdues_library,
240
                'overdues_system'              => $overdues_system,
241
                'overdues_7days_library'       => $overdues_7days_library,
242
                'overdues_7days_system'        => $overdues_7days_system,
243
                'overdues_14days_library'      => $overdues_14days_library,
244
                'overdues_14days_system'       => $overdues_14days_system,
245
                'overdues_21days_library'      => $overdues_21days_library,
246
                'overdues_21days_system'       => $overdues_21days_system,
247
                'very_overdue_library'         => $very_overdue_library,
248
                'very_overdue_system'          => $very_overdue_system,
249
                'loan_history_system'          => $loan_history_system,
250
                'loan_history_library'         => $loan_history_library,
251
                'issues_library'               => $issues_library,
252
                'issues_system'                => $issues_system,
253
                'items_library'                => $items_library,
254
                'items_system'                 => $items_system,
255
                'borrowers_library'            => $borrowers_library,
256
                'last_updated'                 => $last_updated
257
                    );
258
    }  else {
259
        $template->{VARS}->{'nofile'} = 1;
260
    }
261
266
}
262
}
267
263
268
# Dashboard end
264
# Dashboard end
269
- 

Return to bug 6828