[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17656] Dev-syncromind: Merge 17483:17654 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17656] Dev-syncromind: Merge 17483:17654 from trunk |
|
Date: |
Sat, 20 Jan 2018 07:51:22 -0500 (EST) |
Revision: 17656
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17656
Author: sigurdne
Date: 2018-01-20 07:51:21 -0500 (Sat, 20 Jan 2018)
Log Message:
-----------
Dev-syncromind: Merge 17483:17654 from trunk
Modified Paths:
--------------
branches/dev-syncromind/.gitignore
branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
branches/dev-syncromind/admin/setup/phpgw_no.lang
branches/dev-syncromind/admin/templates/base/config.tpl
branches/dev-syncromind/bim/setup/setup.inc.php
branches/dev-syncromind/booking/inc/class.async_task_send_reminder.inc.php
branches/dev-syncromind/booking/inc/class.boallocation.inc.php
branches/dev-syncromind/booking/inc/class.boapplication.inc.php
branches/dev-syncromind/booking/inc/class.bobooking.inc.php
branches/dev-syncromind/booking/inc/class.boevent.inc.php
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export.inc.php
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uicommon.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
branches/dev-syncromind/booking/js/base/common.js
branches/dev-syncromind/booking/setup/phpgw_no.lang
branches/dev-syncromind/booking/templates/base/allocation.xsl
branches/dev-syncromind/booking/templates/base/application.xsl
branches/dev-syncromind/booking/templates/base/application_edit.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
branches/dev-syncromind/booking/templates/base/config.tpl
branches/dev-syncromind/booking/templates/base/event_edit.xsl
branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
branches/dev-syncromind/bookingfrontend/setup/default_records.inc.php
branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang
branches/dev-syncromind/bookingfrontend/templates/aalesund/application.xsl
branches/dev-syncromind/bookingfrontend/templates/aalesund/application_new.xsl
branches/dev-syncromind/bookingfrontend/templates/aalesund/building.xsl
branches/dev-syncromind/bookingfrontend/templates/aalesund/organization.xsl
branches/dev-syncromind/bookingfrontend/templates/aalesund/resource.xsl
branches/dev-syncromind/bookingfrontend/templates/aalesund/search.xsl
branches/dev-syncromind/bookingfrontend/templates/base/config.tpl
branches/dev-syncromind/controller/inc/class.uicalendar.inc.php
branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
branches/dev-syncromind/demo/setup/phpgw_no.lang
branches/dev-syncromind/eventplanner/inc/class.bobooking.inc.php
branches/dev-syncromind/eventplanner/inc/class.bocalendar.inc.php
branches/dev-syncromind/eventplanner/setup/phpgw_no.lang
branches/dev-syncromind/felamimail/setup/egw_no.lang
branches/dev-syncromind/helpdesk/inc/class.botts.inc.php
branches/dev-syncromind/helpdesk/setup/phpgw_no.lang
branches/dev-syncromind/logistic/setup/phpgw_no.lang
branches/dev-syncromind/phpgwapi/doc/Vagrantfile
branches/dev-syncromind/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/dev-syncromind/phpgwapi/inc/class.send.inc.php
branches/dev-syncromind/phpgwapi/inc/class.setup_html.inc.php
branches/dev-syncromind/phpgwapi/inc/class.setup_translation.inc.php
branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/dev-syncromind/phpgwapi/setup/phpgw_no.lang
branches/dev-syncromind/phpgwapi/templates/aalesund/css/sample.css
branches/dev-syncromind/phpgwapi/templates/aalesund/head.inc.php
branches/dev-syncromind/phpgwapi/templates/aalesund/head.tpl
branches/dev-syncromind/phpgwapi/templates/aalesund/js/sample.js
branches/dev-syncromind/phpgwapi/templates/bkbooking/head.inc.php
branches/dev-syncromind/phpgwapi/templates/bookingfrontend/head.inc.php
branches/dev-syncromind/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
branches/dev-syncromind/phpgwapi/templates/frontend/head.inc.php
branches/dev-syncromind/phpgwapi/templates/idsociety/head.inc.php
branches/dev-syncromind/phpgwapi/templates/mobilefrontend/head.inc.php
branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
branches/dev-syncromind/phpgwapi/templates/probusiness/head.inc.php
branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
branches/dev-syncromind/phpgwapi/templates/simple/head.inc.php
branches/dev-syncromind/phpgwapi/templates/verdilak/head.inc.php
branches/dev-syncromind/preferences/inc/hook_settings.inc.php
branches/dev-syncromind/preferences/setup/phpgw_no.lang
branches/dev-syncromind/property/inc/class.bocommon.inc.php
branches/dev-syncromind/property/inc/class.boevent.inc.php
branches/dev-syncromind/property/inc/class.bogeneric.inc.php
branches/dev-syncromind/property/inc/class.botts.inc.php
branches/dev-syncromind/property/inc/class.boworkorder.inc.php
branches/dev-syncromind/property/inc/class.custom_fields.inc.php
branches/dev-syncromind/property/inc/class.menu.inc.php
branches/dev-syncromind/property/inc/class.sogeneric.inc.php
branches/dev-syncromind/property/inc/class.sogeneric_.inc.php
branches/dev-syncromind/property/inc/class.sotts.inc.php
branches/dev-syncromind/property/inc/class.uiadmin_entity.inc.php
branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
branches/dev-syncromind/property/inc/class.uientity.inc.php
branches/dev-syncromind/property/inc/class.uigeneric.inc.php
branches/dev-syncromind/property/inc/class.uiimport.inc.php
branches/dev-syncromind/property/inc/class.uilocation.inc.php
branches/dev-syncromind/property/inc/class.uitts.inc.php
branches/dev-syncromind/property/inc/class.uiwo_hour.inc.php
branches/dev-syncromind/property/inc/cron/default/Import_fra_agresso_X205.php
branches/dev-syncromind/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
branches/dev-syncromind/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
branches/dev-syncromind/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
branches/dev-syncromind/property/inc/custom/default/varsle_prosjektoordinator_ved_avsluttet_relatert_melding_BBB.php
branches/dev-syncromind/property/inc/hook_config.inc.php
branches/dev-syncromind/property/inc/hook_settings.inc.php
branches/dev-syncromind/property/setup/default_records.inc.php
branches/dev-syncromind/property/setup/phpgw_no.lang
branches/dev-syncromind/property/setup/phpgw_no_bh.lang
branches/dev-syncromind/property/setup/setup.inc.php
branches/dev-syncromind/property/setup/tables_current.inc.php
branches/dev-syncromind/property/setup/tables_update.inc.php
branches/dev-syncromind/property/templates/base/attributes_view.xsl
branches/dev-syncromind/property/templates/base/config.tpl
branches/dev-syncromind/property/templates/base/location.xsl
branches/dev-syncromind/property/templates/base/tts.xsl
branches/dev-syncromind/rental/inc/model/class.agresso_lg04.inc.php
branches/dev-syncromind/rental/setup/phpgw_no.lang
branches/dev-syncromind/rental/templates/base/config.tpl
branches/dev-syncromind/setup/accounts.php
branches/dev-syncromind/setup/index.php
branches/dev-syncromind/setup/lang/phpgw_en.lang
branches/dev-syncromind/setup/lang/phpgw_no.lang
branches/dev-syncromind/setup/templates/base/head.tpl
branches/dev-syncromind/setup/templates/base/login_main.tpl
Added Paths:
-----------
branches/dev-syncromind/controller/js/controller/ajax_calendar_for_locations.js
branches/dev-syncromind/controller/templates/base/calendar/view_calendar_aggregated.xsl
branches/dev-syncromind/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
branches/dev-syncromind/phpgwapi/templates/aalesund/img/header2.jpg
Property Changed:
----------------
branches/dev-syncromind/
branches/dev-syncromind/booking/
branches/dev-syncromind/bookingfrontend/
Index: branches/dev-syncromind
===================================================================
--- branches/dev-syncromind 2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind 2018-01-20 12:51:21 UTC (rev 17656)
Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:ignore
## -1,9 +1,9 ##
header.inc.php
+.buildpath
+.vscode
.svnignore
.cache
+.project
+nbproject
.settings
-.project
.*.swp
-nbproject
-.buildpath
-.~lock.hms_1_1.xml#
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
-/branches/stavangerkommune:12743-12875,12986
\ No newline at end of property
+/branches/stavangerkommune:12743-12875,12986
+/trunk:17484-17654
\ No newline at end of property
Modified: branches/dev-syncromind/.gitignore
===================================================================
--- branches/dev-syncromind/.gitignore 2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/.gitignore 2018-01-20 12:51:21 UTC (rev 17656)
@@ -2,4 +2,5 @@
/header.inc.php
/.cache
/.settings
-/.project
\ No newline at end of file
+/.project
+/.vscode
\ No newline at end of file
Modified:
branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/activitycalendar/inc/class.uiactivities.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -1271,7 +1271,7 @@
{
$GLOBALS['phpgw']->send->msg('email',
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
if ($e)
{
@@ -1334,7 +1334,7 @@
{
$GLOBALS['phpgw']->send->msg('email',
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
if ($e)
{
Modified: branches/dev-syncromind/admin/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/admin/setup/phpgw_no.lang 2018-01-20 12:44:47 UTC
(rev 17655)
+++ branches/dev-syncromind/admin/setup/phpgw_no.lang 2018-01-20 12:51:21 UTC
(rev 17656)
@@ -8,6 +8,8 @@
create group admin no Lag Gruppe
delete message admin no Slett Melding
disabled admin no Deaktivert
+disabled (not recomended) admin no Deaktivert (ikke anbefalt)
+fallback (after each pageview) admin no Fallback (etter hver
sidevisning)
display admin no Vis
global message admin no Global Melding
group name admin no Gruppenavn
@@ -40,15 +42,15 @@
title admin no Overskrift
important message admin no Viktig informasjon
enabled admin no Aktiv
-(to install new applications use<br><a href=setup/" target="setup">setup</a>
[manage applications] !!!)" admin no (For å installere nye
moduler, bruk<br><a href=setup/" target="setup">setup</a> [manage applications]
!!!)"
+(To install new applications use<br><a href="setup/" target="setup">Setup</a>
[Manage Applications] !!!) admin no (For å installere nye moduler,
bruk<br><a href="setup/" target="setup">setup</a> [manage applications] !!!)
add a category admin no Legg til kategori
add a section admin no Legg til seksjon
add a subcategory admin no Legg til undekategori
admins admin no Admins
appearance admin no Utseende
-attribute admin no Atributt
-attributes admin no Atributter
-attributes for this config section admin no Atributter for denne
konfigurasjonsseksjonen
+attribute admin no Egenskap
+attributes admin no Egenskaper
+attributes for this config section admin no Egenskaper for denne
konfigurasjonsseksjonen
category list admin no Kategoriliste
check ip address of all sessions admin no Kontroller IP-adresse
for sesjoner
close window admin no Lukk vindu
@@ -58,7 +60,7 @@
delete this category admin no Slett kategorien
edit the config admin no Endre konfigurasjon
edit this category admin no Endre kategorien
-email domain admin no Email domene
+email domain admin no E-post domene
enter the background color for the login page admin no Angi
bakgrunnsfarge for innloggingssiden
enter the background color for the site title admin no Angi
bakgrunnsfarge for nettstedstittelen
enter the file name of your logo admin no Angi filnavnet for logo
@@ -89,7 +91,7 @@
smtpdebug admin no smtpdebug
smtpsecure admin no smtpsecure
submit the search string admin no Send søketekst
-support email address admin no Epost brukerstøtte
+support email address admin no E-post brukerstøtte
total records: %1 admin no Antall poster: %1
use cookies to pass sessionid admin no Bruk cookier til å håndtere
sesjoner
use smtp auth admin no Bruk smtp autentisering
@@ -98,4 +100,43 @@
warn admin no Varsel
add category admin no Legg til kategori
edit category admin no Endre kategori
-parent category admin no Foreldrekategori
\ No newline at end of file
+parent category admin no Foreldrekategori
+add user admin no Legg til bruker
+add user account admin no Legg til brukerkonto
+Account aktiv admin no Konto aktiv
+action admin no Handling
+file admin no Fil
+info admin no Informasjon
+notice admin no
+hooks updated admin no Applikasjonskoblinger er oppdatert
+the new hooks should be available to all users admin no Nye
applikasjonskoblinger er tilgjengelig for alle brukere
+async services last executed admin no Asynkrone servicer ble sist
utført
+run asynchronous services admin no Kjør asynkrone servicer
+asyncservices not yet installed or other error (%1) !!! admin no
Asynkrone servicer er ikke installert, eller annen feil (%1) !!!
+crontab only (recomended) admin no Bare crontab (anbefalt)
+installed crontab admin no Installert crontab
+install crontab admin no Installer crontab
+for the times below (empty values count as '*', all empty = every minute)
admin no For de tidene under (tomme verdier teller som '*', hvis alle er
tom = hvert minutt)
+year admin no År
+month admin no Måned
+day of week (0-6, 0=sun) admin no Ukedag (0-6, 0=Søn)
+hour admin no Time
+minute admin no Minutt
+calculate next run admin no Kalkuler neste kjøring
+enable debug-messages admin no Aktiver feilsøkingsmeldinger
+cancel testjob! admin no Kanseller testjobb!
+start testjob! admin no Start testjobb!
+for the times above admin no For tidene over
+the testjob sends you a mail everytime it is called admin no
Testjobben sender deg en e-post hver gang den blir kjørt
+jobs admin no Jobber
+next run admin no Neste kjøring
+times admin no Tider
+update admin no Oppdater
+manual run admin no Manuell kjøring
+method admin no Metode
+data admin no Data
+settings admin no Innstillinger
+color selector admin no Farge velger
+would you like to check for a new version when admins login admin no
Vil du sjekke om det finnes ny versjon når administratorer logger inn
+view error log common no Vis feilmeldingslogg
+please set a site name in admin > siteconfig common no
Vennligst angi tittelen for systemet i Administrasjon > Admin > Global
konfigurasjon
\ No newline at end of file
Modified: branches/dev-syncromind/admin/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind/admin/templates/base/config.tpl 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/admin/templates/base/config.tpl 2018-01-20
12:51:21 UTC (rev 17656)
@@ -12,8 +12,8 @@
<tbody>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version_when_admins_login_?}:</td>
+ <!--tr class="pure-table-odd">
+
<td>{lang_Would_you_like_to_check_for_a_new_version_when_admins_login}?:</td>
<td>
<select
name="newsettings[checkfornewversion]">
<option
value="">{lang_No}</option>
@@ -20,20 +20,20 @@
<option
value="True"{selected_checkfornewversion_True}>{lang_Yes}</option>
</select>
</td>
- </tr>
+ </tr-->
<tr>
-
<td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
+ <td>{lang_Timeout_for_sessions_in_seconds}
(default 14400 = 4 hours):</td>
<td><input size="8"
name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
+
<td>{lang_Timeout_for_application_session_data_in_seconds} (default 86400 = 1
day):</td>
<td><input size="8"
name="newsettings[sessions_app_timeout]"
value="{value_sessions_app_timeout}"></td>
</tr>
<tr>
-
<td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
+
<td>{lang_Would_you_like_to_show_each_applications_upgrade_status}?:</td><td>
<select
name="newsettings[checkappversions]">
<option
value="">{lang_No}</option>
<option
value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
@@ -43,7 +43,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array_?}:</td>
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array}?:</td>
<td>
<select
name="newsettings[cache_phpgw_info]">
<option
value="">{lang_No}</option>
@@ -58,7 +58,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
+
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_at_login_time}?:</td>
<td>
<select
name="newsettings[disable_autoload_langfiles]">
<option
value="">{lang_Yes}</option>
@@ -68,7 +68,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory_?}:</td>
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory}?:</td>
<td>
<select name="newsettings[shm_enable]">
<option
value="">{lang_No}</option>
@@ -82,7 +82,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_SMTP_server_hostname_(or_IP_address)}:</td>
+
<td>{lang_SMTP_server_hostname_or_IP_address}:</td>
<td><input name="newsettings[smtp_server]"
value="{value_smtp_server}" /></td>
</tr>
@@ -214,7 +214,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
+
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries}?:</td>
<td>
<select
name="newsettings[deny_user_grants_access]">
<option
value="">{lang_No}</option>
@@ -224,7 +224,7 @@
</tr>
<tr>
-
<td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+
<td>{lang_How_many_days_should_entries_stay_in_the_access_log_before_they_get_deleted}?
(default 90):</td>
<td>
<input
name="newsettings[max_access_log_age]" value="{value_max_access_log_age}"
size="5">
</td>
@@ -231,7 +231,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login_an_account_should_be_blocked}?
(default 3):</td>
<td>
<input
name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}"
size="5">
</td>
@@ -238,7 +238,7 @@
</tr>
<tr>
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login_an_IP_should_be_blocked}?
(default 3):</td>
<td>
<input
name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}"
size="5">
</td>
@@ -245,7 +245,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked}? (default
30):</td>
<td>
<input name="newsettings[block_time]"
value="{value_block_time}" size="5">
</td>
@@ -252,7 +252,7 @@
</tr>
<tr>
-
<td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+
<td>{lang_comma_separated_admin_email_addresses_to_be_notified_about_the_blocking}:</td>
<td>
<input name="newsettings[admin_mails]"
value="{value_admin_mails}" size="40">
</td>
@@ -259,7 +259,7 @@
</tr>
<tr class="pure-table-odd">
-
<td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
+
<td>{lang_Disable_auto_completion_of_the_login_form_}:</td>
<td>
<select
name="newsettings[autocomplete_login]">
<option
value="">{lang_No}</option>
Modified: branches/dev-syncromind/bim/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/bim/setup/setup.inc.php 2018-01-20 12:44:47 UTC
(rev 17655)
+++ branches/dev-syncromind/bim/setup/setup.inc.php 2018-01-20 12:51:21 UTC
(rev 17656)
@@ -13,7 +13,7 @@
$setup_info['bim']['name'] = 'bim';
$setup_info['bim']['version'] = '0.9.17.511';
$setup_info['bim']['app_order'] = 8;
- $setup_info['bim']['enable'] = 1;
+ $setup_info['bim']['enable'] = 2;
$setup_info['bim']['app_group'] = 'office';
$setup_info['bim']['author'] = array
Index: branches/dev-syncromind/booking
===================================================================
--- branches/dev-syncromind/booking 2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking 2018-01-20 12:51:21 UTC (rev 17656)
Property changes on: branches/dev-syncromind/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
-/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
\ No newline at end of property
+/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
+/trunk/booking:17484-17654
\ No newline at end of property
Modified:
branches/dev-syncromind/booking/inc/class.async_task_send_reminder.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.async_task_send_reminder.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.async_task_send_reminder.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -65,7 +65,7 @@
$sql = "update bb_booking set
reminder = 3 where id = " . $booking['id'];
$this->db->query($sql);
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// do nothing. nowhere to log
or display error messages
}
@@ -103,7 +103,7 @@
$sql = "update bb_event set reminder =
3 where id = " . $event['id'];
$this->db->query($sql);
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// do nothing. nowhere to log or
display error messages
}
Modified: branches/dev-syncromind/booking/inc/class.boallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.boallocation.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.boallocation.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -81,7 +81,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -166,7 +166,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: branches/dev-syncromind/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.boapplication.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.boapplication.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -115,7 +115,7 @@
{
$send->msg('email', $bemail, $bsubject, $bbody, '', '', '', $from, '', 'html');
}
- catch
(phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform
user if something goes wrong
}
@@ -145,7 +145,7 @@
{
$send->msg('email',
$application['contact_email'], $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes wrong
}
@@ -157,7 +157,9 @@
function send_admin_notification( $application, $message = null
)
{
if
(!(isset($GLOBALS['phpgw_info']['server']['smtp_server']) &&
$GLOBALS['phpgw_info']['server']['smtp_server']))
- return;
+ {
+// return;
+ }
$send = CreateObject('phpgwapi.send');
$config = CreateObject('phpgwapi.config', 'booking');
@@ -173,9 +175,13 @@
$mailadresses = explode("\n", $mailadresses);
if ($GLOBALS['phpgw_info']['server']['webserver_url']
!= '' && isset($config->config_data['external_site_address']))
+ {
$link = $external_site_address .
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+ }
else
+ {
$link = $external_site_address .
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+ }
$activity =
$this->activity_bo->read_single($application['activity_id']);
@@ -203,7 +209,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: branches/dev-syncromind/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.bobooking.inc.php 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.bobooking.inc.php 2018-01-20
12:51:21 UTC (rev 17656)
@@ -158,7 +158,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -287,7 +287,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified: branches/dev-syncromind/booking/inc/class.boevent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.boevent.inc.php 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.boevent.inc.php 2018-01-20
12:51:21 UTC (rev 17656)
@@ -164,7 +164,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -252,7 +252,7 @@
{
$send->msg('email', $adr, $subject,
$body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
Modified:
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++
branches/dev-syncromind/booking/inc/class.socompleted_reservation_export.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -676,6 +676,198 @@
// fakturagrunnlag.
// MRK07 - Internfaktura merkes ved verdi 1 i dette
feltet.
+
+ $export_info = array();
+ $output = array();
+
+ $log = array();
+
+ $date = str_pad(date('Ymd'), 17, ' ', STR_PAD_LEFT);
+
+ $config = CreateObject('phpgwapi.config', 'booking');
+ $config->read();
+
+
+
+ $stored_header = array();
+ $line_no = 0;
+ $header_count = 0;
+ $log_order_id = '';
+ $log_customer_name = '';
+ $log_customer_nr = '';
+ $log_buidling = '';
+
+ $internal = false;
+
+ $ant_post = 0;
+ $linjenr = 1;
+ $lopenr = 1;
+
+ foreach ($reservations as &$reservation)
+ {
+ if ($this->get_cost_value($reservation['cost'])
<= 0)
+ {
+ continue; //Don't export costless rows
+ }
+
+ if (!empty($reservation['organization_id']))
+ {
+ $org =
$this->organization_bo->read_single($reservation['organization_id']);
+ $reservation['organization_name'] =
$org['name'];
+ }
+ else
+ {
+ $data =
$this->event_so->get_org($reservation['customer_organization_number']);
+ if (!empty($data['id']))
+ {
+
$reservation['organization_name'] = $data['name'];
+ }
+ else
+ {
+ if
($reservation['reservation_type'] == 'event')
+ {
+ $data =
$this->event_bo->read_single($reservation['reservation_id']);
+
$reservation['organization_name'] = $data['contact_name'];
+# } elseif
($reservation['reservation_type'] == 'booking') {
+# $data =
$this->booking_bo->read_single($reservation['reservation_id']);
+#
error_log('b'.$data['id']." ".$data['group_id']);
+# } else {
+# $data =
$this->allocation_bo->read_single($reservation['reservation_id']);
+#
error_log('a'.$data['id']." ".$data['organization_id']);
+ }
+ }
+ }
+
+ $type = $reservation['customer_type'];
+
+ $order_id =
$sequential_number_generator->increment()->get_current();
+ $export_info[] =
$this->create_export_item_info($reservation, $order_id);
+ $header_count += 1;
+ $stored_header['kundenr'] = $kundenr;
+
+ $kundenr =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 11),
11, '0', STR_PAD_LEFT);
+
+
+ if
(strlen($this->get_customer_identifier_value_for($reservation)) > 9)
+ {
+ $name = str_pad(iconv("utf-8",
"ISO-8859-1//TRANSLIT", $reservation['organization_name']), 40, ' ');
+ }
+ else
+ {
+ $name = str_pad(iconv("utf-8",
"ISO-8859-1//TRANSLIT", $reservation['organization_name']), 40, ' ');
+ }
+
+ //Startpost ST
+ $startpost = $this->get_visma_ST_row_template();
+ $startpost['posttype'] = 'ST';
+ $startpost['referanse'] =
str_pad(substr(iconv("utf-8", "ISO-8859-1//TRANSLIT",
$reservation['article_description']), 0, 60), 60, ' ');
+# $startpost['referanse'] =
str_pad(substr(iconv("utf-8","ISO-8859-1//TRANSLIT",$account_codes['invoice_instruction']),
0, 60), 60, ' ');
+ //Fakturalinje FL
+ $fakturalinje =
$this->get_visma_FL_row_template();
+ $fakturalinje['posttype'] = 'FL';
+ $fakturalinje['kundenr'] = $kundenr;
+ $fakturalinje['navn'] = $name;
+# $fakturalinje['adresse1'] = ;
+# $fakturalinje['adresse2'] = ;
+# $fakturalinje['postnr'] = ;
+ $fakturalinje['betform'] = 'BG';
+ $fakturalinje['oppdrgnr'] =
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT",
$account_codes['object_number']), 3, '0', STR_PAD_LEFT);
+ $fakturalinje['varenr'] =
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT",
$account_codes['responsible_code']), 4, '0', STR_PAD_LEFT);
+ $fakturalinje['lopenr'] =
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT", $lopenr), 2, '0', STR_PAD_LEFT);
+ $fakturalinje['pris'] =
str_pad($reservation['cost'] * 100, 8, '0', STR_PAD_LEFT) . ' ';
+ $fakturalinje['grunnlag'] = '000000001';
+ $fakturalinje['belop'] =
str_pad($reservation['cost'] * 100, 8, '0', STR_PAD_LEFT) . ' ';
+# $fakturalinje['saksnr'] = ;
+ //Linjetekst LT
+ $linjetekst =
$this->get_visma_LT_row_template();
+ $linjetekst['posttype'] = 'LT';
+ $linjetekst['kundenr'] = $kundenr;
+ $linjetekst['oppdrgnr'] =
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT",
$account_codes['object_number']), 3, '0', STR_PAD_LEFT);
+ $linjetekst['varenr'] = str_pad(iconv("utf-8",
"ISO-8859-1//TRANSLIT", $account_codes['responsible_code']), 4, '0',
STR_PAD_LEFT);
+ $linjetekst['lopenr'] = str_pad(iconv("utf-8",
"ISO-8859-1//TRANSLIT", $lopenr), 2, '0', STR_PAD_LEFT);
+ $linjetekst['linjenr'] = $linjenr;
+ $linjetekst['tekst'] = str_pad(iconv("utf-8",
"ISO-8859-1//TRANSLIT", $reservation['description']), 50, ' ');
+ $ant_post += 3;
+
+ //Sluttpost SL
+ $sluttpost = $this->get_visma_SL_row_template();
+ $sluttpost['posttype'] = 'SL';
+ $sluttpost['antpost'] =
str_pad(intval($ant_post) + 1, 8, '0', STR_PAD_LEFT);
+ $ant_post = 0;
+
+
+ $log_order_id = $order_id;
+
+ if (!empty($reservation['organization_id']))
+ {
+ $org =
$this->organization_bo->read_single($reservation['organization_id']);
+ $log_customer_name = $org['name'];
+ }
+ else
+ {
+ $data =
$this->event_so->get_org($reservation['customer_organization_number']);
+ if (!empty($data['id']))
+ {
+ $log_customer_name =
$data['name'];
+ }
+ else
+ {
+ if
($reservation['reservation_type'] == 'event')
+ {
+ $data =
$this->event_bo->read_single($reservation['reservation_id']);
+ $log_customer_name =
$data['contact_name'];
+# } elseif
($reservation['reservation_type'] == 'booking') {
+# $data =
$this->booking_bo->read_single($reservation['reservation_id']);
+#
error_log('b'.$data['id']." ".$data['group_id']);
+# } else {
+# $data =
$this->allocation_bo->read_single($reservation['reservation_id']);
+#
error_log('a'.$data['id']." ".$data['organization_id']);
+ }
+ }
+ }
+
+ $log_customer_nr =
$this->get_customer_identifier_value_for($reservation);
+ $log_buidling = $reservation['building_name'];
+ $log_cost = $reservation['cost'];
+ $log_varelinjer_med_dato =
$reservation['article_description'] . ' - ' . $reservation['description'];
+
+ $line_field = array();
+
+ $line_field[] = "\"{$reservation['id']}\"";
+ $line_field[] =
"\"{$reservation['reservation_type']}\"";
+ $line_field[] = "\"{$log_order_id}\"";
+ $line_field[] = "\"{$log_customer_name}\"";
+ $line_field[] = "\"{$log_customer_nr}\"";
+ $line_field[] =
"\"{$log_varelinjer_med_dato}\"";
+ $line_field[] = "\"{$log_buidling}\"";
+ $line_field[] = "\"{$log_cost}\"";
+
+ $log[] = implode(';', $line_field);
+
+ // $log[] = $reservation['id'] . ';' .
$reservation['reservation_type'] . ';' . $log_order_id . ';' .
$log_customer_name . ' - ' . $log_customer_nr . ';' . $log_varelinjer_med_dato
. ';' . $log_buidling . ';' . $log_cost;
+
+ $output[] = implode('', str_replace(array("\n",
"\r"), '', $startpost));
+ $output[] = implode('', str_replace(array("\n",
"\r"), '', $fakturalinje));
+ $output[] = implode('', str_replace(array("\n",
"\r"), '', $linjetekst));
+ $output[] = implode('', str_replace(array("\n",
"\r"), '', $sluttpost));
+ }
+
+ if (count($export_info) == 0)
+ {
+ return null;
+ }
+ if ($config->config_data['external_format_linebreak']
== 'Windows')
+ {
+ $file_format_linebreak = "\r\n";
+ }
+ else
+ {
+ $file_format_linebreak = "\n";
+ }
+
+ return array('data' => implode($file_format_linebreak,
$output), 'data_log' => implode(PHP_EOL, $log),
+ 'info' => $export_info, 'header_count' =>
$header_count);
+
}
@@ -752,7 +944,7 @@
$item['dim_4'] =
str_pad(substr($account_codes['dim_4'], 0, 8), 8, ' ');
}
- //Kan være aktuelt å levere prosjektnr knyttet
mot en booking, valgfritt
+ //Kan være aktuelt å levere prosjektnr knyttet
mot en booking, valgfritt
if (isset($config->config_data['dim_5']))
{
$item['dim_5'] =
str_pad(strtoupper(substr($account_codes['project_number'], 0, 12)), 12, ' ');
@@ -1530,11 +1722,22 @@
return $row_template;
}
- $row_template = array('posttype' => str_repeat(' ', 2),
'kundenr' => str_repeat(' ', 11),
- 'navn' => str_repeat(' ', 30), 'adresse1' =>
str_repeat(' ', 30), 'adresse2' => str_repeat(' ', 30),
- 'postnr' => str_repeat(' ', 4), 'betform' =>
str_repeat(' ', 2), 'oppdrgnr' => str_repeat(' ', 3),
- 'varenr' => str_repeat(' ', 4), 'lopenr' =>
str_repeat(' ', 2), 'pris' => str_repeat(' ', 9),
- 'grunnlag' => str_repeat(' ', 9), 'belop' =>
str_repeat(' ', 11), 'saksnr' => str_repeat(' ', 16));
+ $row_template = array(
+ 'posttype' => str_repeat(' ', 2),
+ 'kundenr' => str_repeat(' ', 11),
+ 'navn' => str_repeat(' ', 30),
+ 'adresse1' => str_repeat(' ', 30),
+ 'adresse2' => str_repeat(' ', 30),
+ 'postnr' => str_repeat(' ', 4),
+ 'betform' => str_repeat(' ', 2),
+ 'oppdrgnr' => str_repeat(' ', 3),
+ 'varenr' => str_repeat(' ', 4),
+ 'lopenr' => str_repeat(' ', 2),
+ 'pris' => str_repeat(' ', 9),
+ 'grunnlag' => str_repeat(' ', 9),
+ 'belop' => str_repeat(' ', 11),
+ 'saksnr' => str_repeat(' ', 16)
+ );
return $row_template;
}
@@ -1546,9 +1749,14 @@
return $row_template;
}
- $row_template = array('posttype' => str_repeat(' ', 2),
'kundenr' => str_repeat(' ', 11),
- 'oppdrgnr' => str_repeat(' ', 3), 'varenr' =>
str_repeat(' ', 4), 'lopenr' => str_repeat(' ', 2),
- 'linjenr' => str_repeat(' ', 2), 'tekst' =>
str_repeat(' ', 50));
+ $row_template = array(
+ 'posttype' => str_repeat(' ', 2),
+ 'kundenr' => str_repeat(' ', 11),
+ 'oppdrgnr' => str_repeat(' ', 3),
+ 'varenr' => str_repeat(' ', 4),
+ 'lopenr' => str_repeat(' ', 2),
+ 'linjenr' => str_repeat(' ', 2),
+ 'tekst' => str_repeat(' ', 50));
return $row_template;
}
@@ -1563,4 +1771,147 @@
$row_template = array('posttype' => str_repeat(' ', 2),
'antpost' => str_repeat(' ', 8));
return $row_template;
}
+
+ protected function get_visma_ST_row_template()
+ {
+ static $row_template = false;
+ if ($row_template)
+ {
+ return $row_template;
+ }
+
+// Type Felt Lengde Posisjon Beskrivelse
M/K Merknader
+// ---- ------- ------ -------- -----------------------
--- ----------
+// ST POSTTYPE 2 001-002 Posttype M
Verdi 'ST'
+// ST REFERANSE 60 003-062 Referanse K
ST01
+// ST FORMAT 1 063-063 Utvidet format K
ST02
+
+ $row_template = array(
+ 'posttype' => 'ST',
+ 'referanse' => str_repeat(' ', 60),
+ 'format' => 'U'
+ );
+ return $row_template;
+ }
+
+ protected function get_visma_FL_row_template()
+ {
+ static $row_template = false;
+ if ($row_template)
+ {
+ return $row_template;
+ }
+
+// UTVIDET FORMAT PÅ FL-LINJENE
+// ============================
+//
+// FL POSTTYPE 2 001-002 Posttype M
Verdi 'FL'
+// FL KUNDENR 11 003-013 Kundenummer M
+// FL NAVN 40 014-053 Kundens navn K
+// FL ADRESSE1 40 054-093 Adresselinje 1 K
+// FL ADRESSE2 40 094-133 Adresselinje 2 K
+// FL POSTNR 4 134-137 Postnummer K
+// FL BETFORM 2 138-139 Betalingstype (BG,PG) M
MRK01
+// FL OPPDRGNR 3 140-142 Oppdragsgivernummer M
MRK02
+// FL VARENR 4 143-146 Varenummer M
MRK02
+// FL LØPENR 2 147-148 Løpenummer M
MRK03
+// FL PRIS 9 149-157 Varens pris M
MRK04
+// FL GRUNNLAG 9 158-166 Antall av varen M
MRK05
+// FL BELØP 11 167-177 Utregnet beløp M
MRK04
+// FL SAKSNR 16 178-193 Saksnr K
+// FL INTFAKT 1 194-194 Internfaktura K
MRK07
+// FL KB01 12 195-206 1. konteringsverdi K
+// FL KB02 12 207-218 2. konteringsverdi K
+// FL KB03 12 219-230 3. konteringsverdi K
+// FL KB04 12 231-242 4. konteringsverdi K
+// FL KB05 12 243-254 5. konteringsverdi K
+// FL KB06 12 255-266 6. konteringsverdi K
+// FL KB07 12 267-278 7. konteringsverdi K
+// FL KB08 12 279-290 8. konteringsverdi K
+// FL KB09 12 291-302 9. konteringsverdi K
+// FL KB10 12 303-314 10. konteringsverdi K
+// FL MVAKODE 3 315-317 Mva-kode K
+// FL PROFIL 20 318-337 Profil K
+// FL DERESREF 40 338-377 Kontaktinformasjon K
+// FL ORDREREF 20 378-397 Ordrereferanse K
+
+ $row_template = array(
+ 'posttype' => 'FL',
+ 'kundenr' => str_repeat(' ', 11),
+ 'navn' => str_repeat(' ', 40),
+ 'adresse1' => str_repeat(' ', 40),
+ 'adresse2' => str_repeat(' ', 40),
+ 'postnr' => str_repeat(' ', 4),
+ 'betform' => str_repeat(' ', 2),
+ 'oppdrgnr' => str_repeat(' ', 3),
+ 'varenr' => str_repeat(' ', 4),
+ 'lopenr' => str_repeat(' ', 2),
+ 'pris' => str_repeat(' ', 9),
+ 'grunnlag' => str_repeat(' ', 9),
+ 'belop' => str_repeat(' ', 11),
+ 'saksnr' => str_repeat(' ', 16),
+ 'intfakt' => str_repeat(' ', 1),
+ 'kb01' => str_repeat(' ', 12),
+ 'kb02' => str_repeat(' ', 12),
+ 'kb03' => str_repeat(' ', 12),
+ 'kb04' => str_repeat(' ', 12),
+ 'kb05' => str_repeat(' ', 12),
+ 'kb06' => str_repeat(' ', 12),
+ 'kb07' => str_repeat(' ', 12),
+ 'kb08' => str_repeat(' ', 12),
+ 'kb09' => str_repeat(' ', 12),
+ 'kb10' => str_repeat(' ', 12),
+ 'mvakode' => str_repeat(' ', 3),
+ 'profil' => str_repeat(' ', 20),
+ 'deresref' => str_repeat(' ', 40),
+ 'ordreref' => str_repeat(' ', 20),
+ );
+ return $row_template;
+ }
+
+ protected function get_visma_LT_row_template()
+ {
+ static $row_template = false;
+ if ($row_template)
+ {
+ return $row_template;
+ }
+
+// LT POSTTYPE 2 001-002 Posttype M
Verdi 'LT'
+// LT KUNDENR 11 003-013 Kundenummer M
+// LT OPPDRGNR 3 014-016 Oppdragsgivernummer M
+// LT VARENR 4 017-020 Varenummer M
+// LT LØPENR 2 021-022 Løpenummer M
+// LT LINJENR 2 023-024 Linjenummer M
MRK06
+// LT TEKST 50 025-074 Fritekstlinje K
+
+ $row_template = array(
+ 'posttype' => 'LT',
+ 'kundenr' => str_repeat(' ', 11),
+ 'oppdrgnr' => str_repeat(' ', 3),
+ 'varenr' => str_repeat(' ', 4),
+ 'lopenr' => str_repeat(' ', 2),
+ 'linjenr' => str_repeat(' ', 2),
+ 'tekst' => str_repeat(' ', 50)
+ );
+ return $row_template;
+ }
+
+ protected function get_visma_SL_row_template()
+ {
+ static $row_template = false;
+ if ($row_template)
+ {
+ return $row_template;
+ }
+// SL POSTTYPE 2 001-002 Posttype M
Verdi 'SL'
+// SL ANTPOST 8 003-010 Antall poster M
Inkl. Start/Sluttpost
+
+ $row_template = array(
+ 'posttype' => 'SL',
+ 'antpost' => str_repeat(' ', 8)
+ );
+
+ return $row_template;
+ }
}
\ No newline at end of file
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -558,7 +558,7 @@
{
$send->msg('email',
$contact['email'], $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
}
@@ -575,7 +575,7 @@
$allocation['building_name'] =
$allocation['building']['name'];
$errors = array();
$tabs = array();
- $tabs['generic'] = array('label' => lang('Allocations
Edit'), 'link' => '#allocations_edit');
+ $tabs['generic'] = array('label' => lang('edit
allocation'), 'link' => '#allocations_edit');
$active_tab = 'generic';
if ($_SERVER['REQUEST_METHOD'] == 'POST')
@@ -783,6 +783,8 @@
'resource' => $allocation['resource']));
$allocation['edit_link'] =
self::link(array('menuaction' => 'booking.uiallocation.edit',
'id' => $allocation['id']));
+ $allocation['application_link'] =
self::link(array('menuaction' => 'booking.uiapplication.show',
+ 'id' => $allocation['application_id']));
$tabs = array();
$tabs['generic'] = array('label' =>
lang('Allocations'), 'link' => '#allocations');
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -618,11 +618,11 @@
if ($_POST['contact_email'] !=
$_POST['contact_email2'])
{
$errors['email'] = lang('The e-mail
addresses you entered do not match');
- $application['contact_email2'] =
$_POST['contact_email2'];
+ $application['contact_email2'] =
phpgw::get_var('contact_email2', 'string', 'POST');
}
else
{
- $application['contact_email2'] =
$_POST['contact_email2'];
+ $application['contact_email2'] =
phpgw::get_var('contact_email2', 'string', 'POST');
}
foreach ($application['agegroups'] as $ag)
@@ -845,7 +845,7 @@
array_set_default($_POST, 'accepted_documents',
array());
$application = array_merge($application,
extract_values($_POST, $this->fields));
- $application['message'] = $_POST['comment'];
+ $application['message'] =
phpgw::get_var('comment', 'string', 'POST');
$this->agegroup_bo->extract_form_data($application);
$this->extract_customer_identifier($application);
@@ -1041,8 +1041,8 @@
}
elseif ($_POST['comment'])
{
- $application['comment'] =
$_POST['comment'];
- $this->add_comment($application,
$_POST['comment']);
+ $application['comment'] =
phpgw::get_var('comment', 'string', 'POST');
+ $this->add_comment($application,
$application['comment']);
$update = true;
$notify = true;
}
@@ -1049,7 +1049,7 @@
elseif ($_POST['status'])
{
$this->check_application_assigned_to_current_user($application);
- $application['status'] =
$_POST['status'];
+ $application['status'] =
phpgw::get_var('status', 'string', 'POST');
if ($application['status'] ==
'REJECTED')
{
@@ -1193,7 +1193,7 @@
self::check_date_availability($application);
$application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
phpgwapi_jquery::formvalidator_generate(array('file'),
'file_form');
-
+ self::rich_text_editor('comment');
$application['description'] =
html_entity_decode(nl2br($application['description']));
$application['equipment'] =
html_entity_decode(nl2br($application['equipment']));
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2018-01-20
12:51:21 UTC (rev 17656)
@@ -704,7 +704,7 @@
{
$send->msg('email',
$contact['email'], $subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
}
Modified: branches/dev-syncromind/booking/inc/class.uicommon.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uicommon.inc.php 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.uicommon.inc.php 2018-01-20
12:51:21 UTC (rev 17656)
@@ -871,19 +871,19 @@
if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'bookingfrontend')
{
$html = 'var html = "<div
class=\'date-container\'>"+
- "<a class=\'close-btn btnclose\'
href=\'javascript:void(0);\'>' . $lang_remove . '</a>"+
- "<dt><label
for=\'new_start_date_"+this.counter+"\'>' . $lang_from . '</label></dt>"+
- "<dd><input class=\'new_datepicker time\'
name=\'from_[]\' id=\'new_start_date_"+this.counter+"\' type=\'text\'
placeholder =\'' . $placeholder . '\'>"+
- "</input></dd>"+
- "<dt><label for=\'new_end_date_"+this.counter+"\'
>' . $lang_to . '</label></dt>"+
- "<dd><input class=\'new_datepicker time\'
name=\'to_[]\' id=\'new_end_date_"+this.counter+"\' type=\'text\' placeholder
=\'' . $placeholder . '\'>"+
- "</input></dd>"+
+ "<a class=\'btnclose\'
href=\'javascript:void(0);\'>' . $lang_remove . '</a>"+
+ "<div class=\'form-group\'><label
for=\'new_start_date_"+this.counter+"\'>' . $lang_from . '</label>"+
+ "<input class=\'new_datepicker time form-control\'
name=\'from_[]\' id=\'new_start_date_"+this.counter+"\' type=\'text\'
placeholder =\'' . $placeholder . '\'>"+
+ "</input></div>"+
+ "<div class=\'form-group\'><label
for=\'new_end_date_"+this.counter+"\' >' . $lang_to . '</label>"+
+ "<input class=\'new_datepicker time form-control\'
name=\'to_[]\' id=\'new_end_date_"+this.counter+"\' type=\'text\' placeholder
=\'' . $placeholder . '\'>"+
+ "</input></div>"+
"</div>"';
}
else
{
$html = 'var html = "<div
class=\'date-container\'>"+
- "<a class=\'close-btn
btnclose\' href=\'javascript:void(0);\'>-</a>"+
+ "<a class=\'close-btn
btnclose\' href=\'javascript:void(0);\'></a>"+
"<div
class=\'pure-control-group\'>"+
"<label
for=\'new_start_date_"+this.counter+"\'><h4>' . $lang_from . '</h4></label>"+
"<input
class=\'new_datepicker time pure-input-2-3\' name=\'from_[]\'
id=\'new_start_date_"+this.counter+"\' type=\'text\' placeholder =\'' .
$placeholder . '\'>"+
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2018-01-20
12:51:21 UTC (rev 17656)
@@ -617,7 +617,7 @@
{
$send->msg('email', $receiver,
$subject, $body, '', '', '', $from, '', 'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
// TODO: Inform user if something goes
wrong
}
@@ -966,7 +966,8 @@
}
}
$receipt = $this->bo->update($event);
- $this->redirect(array('menuaction' =>
'booking.uievent.edit', 'id' => $event['id']));
+ // $this->redirect(array('menuaction' =>
'booking.uievent.edit', 'id' => $event['id']));
+ $this->redirect(array('menuaction' =>
'booking.uiapplication.show', 'id' => $event['application_id']));
}
}
@@ -999,7 +1000,7 @@
$event['resources_json'] =
json_encode(array_map('intval', $event['resources']));
$event['application_link'] =
self::link(array('menuaction' => 'booking.uiapplication.show',
'id' => $event['application_id']));
- $event['cancel_link'] = self::link(array('menuaction'
=> 'booking.uievent.index'));
+ $event['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiapplication.index'));
$event['editable'] = true;
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
Modified: branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/inc/class.uisend_email.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -129,7 +129,7 @@
$send->msg('email', $contact['email'],
$subject, $body, '', '', '', $from, '', 'html');
$result['ok'][] = $contact;
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$result['failed'][] = $contact;
}
Modified: branches/dev-syncromind/booking/js/base/common.js
===================================================================
--- branches/dev-syncromind/booking/js/base/common.js 2018-01-20 12:44:47 UTC
(rev 17655)
+++ branches/dev-syncromind/booking/js/base/common.js 2018-01-20 12:51:21 UTC
(rev 17656)
@@ -34,9 +34,9 @@
var imgEl =
dlImage.appendChild(document.createElement('dd')).appendChild(document.createElement('img'));
var captionEl =
dlImage.appendChild(document.createElement('dt'));
imgEl.setAttribute('src',
v.src.replace(/&/gi, '&'));
-
captionEl.appendChild(document.createTextNode(v.description));
+ imgEl.setAttribute('onClick',
'openModal(this)');
+
captionEl.appendChild(document.createTextNode(v.description));
container.appendChild(dlImage);
-
});
}
});
Modified: branches/dev-syncromind/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/booking/setup/phpgw_no.lang 2018-01-20 12:44:47 UTC
(rev 17655)
+++ branches/dev-syncromind/booking/setup/phpgw_no.lang 2018-01-20 12:51:21 UTC
(rev 17656)
@@ -19,6 +19,7 @@
add another date booking no Legg til dato
add boundary booking no Legg til rammetid
add comment booking no Legg til kommentar
+comment booking no Kommentar
add document booking no Legg til dokument
add new event booking no Legg til arrangement
event settings booking no Innstillinger for arrangement
@@ -568,14 +569,14 @@
Booking email settings booking no Booking epost oppsett.
System name booking no System navn
Subject booking no Tema
-Mail text for application created booking no Epost tekst for søknad
opprettet.
-Mail text for application pending booking no Epost tekst for søknad
under behandling.
-Mail text for application accepted booking no Epost tekst for søknad
akseptert.
-Mail text for application rejected booking no Epost tekst for søknad
avist.
+Mail text for application created booking no E-post tekst for søknad
opprettet.
+Mail text for application pending booking no E-post tekst for søknad
under behandling.
+Mail text for application accepted booking no E-post tekst for søknad
akseptert.
+Mail text for application rejected booking no E-post tekst for søknad
avslått.
notify on accepted booking no Send kvittering til ansvarlig ved
akseptert.
Signature booking no Signatur
Tilsynsvakt name booking no Navn på tilsynsvakt
-Tilsynsvakt email booking no Epostt tilsynsvakt
+Tilsynsvakt email booking no E-post tilsynsvakt
Tilsynsvakt telephone booking no Telefon tilsynsvakt
Metadata common no Metadata
Author booking no Forfatter
@@ -677,4 +678,44 @@
duplicate ssn booking no Duplikat av f.nr for samme organisasjon
building show booking no Vis bygning
free booking no Ledig
-document new booking no Nytt dokument
\ No newline at end of file
+document new booking no Nytt dokument
+example booking no Eksempel
+booking settings booking no Booking innstillinger
+support email address booking no Brukerstøtte e-post adresse
+external host address booking no Ekstern verts adresse
+custom email sender booking no Tilpasset e-post sender
+logopath frontend booking no Sti til logo for frontend
+image maxheight booking no Makshøyde for bilder
+image maxwidth booking no Maksbredde for bilder
+case_officer booking no Saksbehandler
+allocation new booking no Ny tildeling
+event new booking no Nytt arrangement
+edit booking no Endre
+Delete booking no Slett
+season new booking no Ny sesong
+report participants booking no Deltaker rapport
+report freetime booking no Ledig tid rapport
+report new booking no Ny rapport
+participants per agegroupe booking no Deltaker per aldersguppe
+start time booking no Starttid
+end time booking no Slutttid
+variables booking no Variabler
+horizontal booking no Horisontal
+vertical booking no Vertikal
+permission add booking no Legg til tilatelse
+activity new booking no Ny aktivitet
+account new booking no Ny konteringsstreng
+external account booking no Ekstern konto
+external customer output format booking no Ekstern kunde output
format
+external file linebreak booking no Tegn for linjeskift
+export agresso booking no Agresso eksport
+export method booking no Eksport metode
+export path booking no Eksport sti
+ftp host booking no Ftp vert
+ftp basedir booking no Ftp initiell katalog ved pålogging
+ftp user booking no Ftp bruker
+ftp password booking no Ftp passord
+last id booking no Siste ID
+do not edit! booking no Ikke endre!
+approve booking no Godkjenn
+return to application booking no Tilbake til søknad
\ No newline at end of file
Modified: branches/dev-syncromind/booking/templates/base/allocation.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/templates/base/allocation.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -49,6 +49,10 @@
</div>
</form>
<div class="pure-control-group">
+ <button class="pure-button pure-button-primary">
+ <xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="allocation/application_link"/>"</xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'return to
application')" />
+ </button>
<xsl:if test="allocation/permission/write">
<button class="pure-button pure-button-primary">
<xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="allocation/edit_link"/>"</xsl:attribute>
Modified: branches/dev-syncromind/booking/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/templates/base/application.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -19,7 +19,6 @@
.pure-form-contentTable {display: inline-block;}
</style>
- <xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:call-template name="msgbox"/>
<div class= "pure-form pure-form-aligned" id="form" name="form">
<input type="hidden" name="tab" value=""/>
@@ -28,7 +27,7 @@
<div id="application" class="booking-container">
<fieldset>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<h1>
<xsl:value-of
select="application/id"/>
</h1>
@@ -106,7 +105,7 @@
<br />Melding fra saksbehandler ligger under historikk, deretter vises kopi av
din søknad.<br /> Skal du gi en melding til saksbehandler skriver du denne inn
i feltet under "Legg til en kommentar"</span>
</div>
</xsl:if>
- <form method="POST">
+ <!--
<form method="POST">
<div
class="pure-control-group">
<label
for="comment">
<xsl:value-of select="php:function('lang', 'Add a comment')" />
@@ -118,42 +117,55 @@
<label> </label>
<input
type="submit" value="{php:function('lang', 'Add comment')}" />
</div>
- </form>
+ </form>-->
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>1.
<xsl:value-of select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></h3>
</legend>
</div>
- <xsl:for-each
select="application/comments[author]">
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/>
- </label>
-
<xsl:choose>
-
<xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
-
<span>
-
<xsl:value-of select="comment" disable-output-escaping="yes"/>
-
</span>
-
</xsl:when>
-
<xsl:otherwise>
-
<span>
-
<!--xsl:value-of select="comment"/-->
-
<xsl:value-of select="comment" disable-output-escaping="yes"/>
-
-
</span>
-
</xsl:otherwise>
-
</xsl:choose>
- </div>
- </xsl:for-each>
+ <table
class="historyTable">
+ <tr>
+ <th>
+
<xsl:value-of select="php:function('lang', 'Time')" />
+ </th>
+ <th>
+
<xsl:value-of select="php:function('lang', 'Comment')" />
+ </th>
+ </tr>
+
+ <xsl:for-each
select="application/comments[author]">
+
+ <tr>
+
<td>
+
<xsl:value-of select="php:function('pretty_timestamp', time)"/>:
<xsl:value-of select="author"/>
+
</td>
+
<xsl:choose>
+
<xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
+
<td>
+
<xsl:value-of select="comment"
disable-output-escaping="yes"/>
+
</td>
+
</xsl:when>
+
<xsl:otherwise>
+
<td>
+
<xsl:value-of select="comment"
disable-output-escaping="yes"/>
+
</td>
+
</xsl:otherwise>
+
</xsl:choose>
+ </tr>
+
+
+ </xsl:for-each>
+
+ </table>
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>1.1
<xsl:value-of select="php:function('lang', 'attachments')" /></h3>
@@ -160,6 +172,7 @@
</legend>
</div>
<div
id="attachments_container"/>
+ <br/>
<form method="POST"
enctype='multipart/form-data' id='file_form'>
<input
name="name" id='field_name' type='file' >
<xsl:attribute name='title'>
@@ -179,6 +192,7 @@
</xsl:attribute>
</input>
<br/>
+ <br/>
<input
type="submit" value="{php:function('lang', 'Add attachment')}" />
</form>
@@ -186,7 +200,7 @@
</div>
<div class="pure-g">
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>2.
<xsl:value-of select="php:function('lang', 'Why?')" /></h3>
@@ -202,10 +216,10 @@
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'Information about the event')" />
+
<xsl:value-of select="php:function('lang', 'Description')" />
</label>
<span>
-
<xsl:value-of disable-output-escaping="yes" select="application/description"/>
+
<xsl:value-of select="application/description" disable-output-escaping="yes"/>
</span>
</div>
<div
class="pure-control-group">
@@ -214,11 +228,11 @@
<xsl:value-of select="php:function('lang', 'Extra info')" />
</h4>
</label>
- <xsl:value-of
disable-output-escaping="yes" select="application/equipment"/>
+ <xsl:value-of
select="application/equipment" disable-output-escaping="yes"/>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>3.
<xsl:value-of select="php:function('lang', 'Where?')" /></h3>
@@ -241,7 +255,7 @@
<div
id="resources_container" class="pure-form-contentTable"></div>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>4.
<xsl:value-of select="php:function('lang', 'When?')" /></h3>
@@ -297,13 +311,10 @@
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
eventParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="event_params"/>;
-
var allocationaddURL = phpGWLink('index.php',
{menuaction:'booking.uiallocation.add'});
-
var bookingaddURL = phpGWLink('index.php',
{menuaction:'booking.uibooking.add'});
-
var eventaddURL = phpGWLink('index.php', {menuaction:'booking.uievent.add'});
</script>
<div
class="pure-control-group">
<label> </label>
-
<select name="create" onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl(allocationaddURL, allocationParams[{id}]);
if(this.selectedIndex==2) JqueryPortico.booking.postToUrl(bookingaddURL,
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl(eventaddURL, eventParams[{id}]);">
+
<select name="create" onchange="if(this.selectedIndex==1)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
JqueryPortico.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
<xsl:if test="not(../case_officer/is_current_user)">
<xsl:attribute name="disabled">disabled</xsl:attribute>
</xsl:if>
@@ -332,7 +343,7 @@
</xsl:if>
</xsl:for-each>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>5.
<xsl:value-of select="php:function('lang', 'Who?')" /></h3>
@@ -395,7 +406,7 @@
</div>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>6.
<xsl:value-of select="php:function('lang', 'Contact information')" /></h3>
@@ -426,7 +437,7 @@
</span>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>7.
<xsl:value-of select="php:function('lang', 'responsible applicant')" /> /
<xsl:value-of select="php:function('lang', 'invoice information')" /></h3>
@@ -437,21 +448,23 @@
<label>
<xsl:value-of select="php:function('lang', 'organization number')" />
</label>
- <br/>
-
<xsl:value-of select="application/customer_organization_number"/>
+ <span>
+
<xsl:value-of select="application/customer_organization_number"/>
+ </span>
</xsl:if>
<xsl:if
test="application/customer_identifier_type = 'ssn'">
<label>
<xsl:value-of select="php:function('lang', 'Date of birth or SSN')" />
</label>
- <br/>
-
<xsl:value-of select="application/customer_ssn"/>
+ <span>
+
<xsl:value-of select="application/customer_ssn"/>
+ </span>
</xsl:if>
</div>
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>8.
<xsl:value-of select="php:function('lang', 'Terms and conditions')" /></h3>
@@ -474,7 +487,7 @@
</div>
<xsl:if test="not(frontend)">
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div
class="heading">
<legend>
<h3>
@@ -490,7 +503,7 @@
</xsl:if>
<xsl:if test="application/edit_link">
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div
class="heading">
<legend>
<h3>
@@ -498,6 +511,20 @@
</h3>
</legend>
</div>
+ <form
method="POST">
+ <div
class="pure-control-group">
+
<label for="comment">
+
<xsl:value-of select="php:function('lang', 'Add a comment')" />
+
</label>
+
<textarea name="comment" id="comment" style="width: 60%; height:
7em"></textarea>
+
<br/>
+ </div>
+ <div
class="pure-control-group">
+
<label> </label>
+
<input type="submit" value="{php:function('lang', 'Add comment')}" />
+ </div>
+ </form>
+ <br/>
<div
class="pure-control-group">
<xsl:if
test="application/case_officer/is_current_user">
<form method="POST" style="display:inline">
Modified: branches/dev-syncromind/booking/templates/base/application_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_edit.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/templates/base/application_edit.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -36,7 +36,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>1.
<xsl:value-of select="php:function('lang', 'Why?')" /></h3>
@@ -109,7 +109,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>2.
<xsl:value-of select="php:function('lang', 'Where?')" /></h3>
@@ -158,7 +158,7 @@
</div>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>3.
<xsl:value-of select="php:function('lang', 'When?')" /></h3>
@@ -255,7 +255,7 @@
</a>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>4.
<xsl:value-of select="php:function('lang', 'Who?')" /></h3>
@@ -354,7 +354,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>
@@ -410,7 +410,7 @@
</input>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="heading">
<legend>
<h3>
@@ -422,7 +422,7 @@
<xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
</div>
</div>
- <div class="pure-u-1
pure-u-md-1 pure-u-lg-1-3">
+ <div class="pure-u-1
pure-u-md-10-24 pure-u-lg-14-24">
<div class="pure-g">
<div
class="pure-control-group pure-u-1 pure-u-md-1-2 pure-u-lg-1">
<div
class="heading">
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -78,7 +78,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-14-24
pure-u-lg-10-24">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -143,7 +143,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -194,7 +194,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -304,7 +304,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -345,7 +345,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
@@ -422,7 +422,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div
class="pure-control-group">
<div
class="heading">
@@ -450,7 +450,7 @@
</div>
</fieldset>
</div>
- <div class="pure-u-1 pure-u-md-1-2
pure-u-lg-1-3">
+ <div class="pure-u-1 pure-u-md-10-24
pure-u-lg-14-24">
<fieldset>
<div class="heading">
<legend>
Modified: branches/dev-syncromind/booking/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind/booking/templates/base/config.tpl 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/templates/base/config.tpl 2018-01-20
12:51:21 UTC (rev 17656)
@@ -13,23 +13,23 @@
<td
colspan="2"> <b>{lang_booking_settings}</b></td>
</tr>
<tr class="row_on">
- <td>{lang_external_host_address}:Example:
https://www.bergen.kommune.no</td>
+ <td>{lang_external_host_address}:{lang_example}:
https://www.bergen.kommune.no</td>
<td><input name="newsettings[external_site_address]"
value="{value_external_site_address}"></td>
</tr>
<tr class="row_off">
- <td>{lang_custom_email_sender}:example:
noreply<address@hidden></td>
+ <td>{lang_custom_email_sender}:{lang_example}:
noreply<address@hidden></td>
<td><input name="newsettings[email_sender]"
value="{value_email_sender}"></td>
</tr>
<tr class="row_on">
- <td>{lang_logopath_frontend}:example:
/phpgwapi/templates/bkbooking/images/bergen_logo.png</td>
+ <td>{lang_logopath_frontend}:{lang_example}:
/phpgwapi/templates/bkbooking/images/bergen_logo.png</td>
<td><input name="newsettings[logopath_frontend]"
value="{value_logopath_frontend}"></td>
</tr>
<tr class="row_off">
- <td>{lang_image_maxheight}:example: 300</td>
+ <td>{lang_image_maxheight}:{lang_example}: 300</td>
<td><input name="newsettings[image_maxheight]"
value="{value_image_maxheight}"></td>
</tr>
<tr class="row_on">
- <td>{lang_image_maxwidth}:example: 300</td>
+ <td>{lang_image_maxwidth}:{lang_example}: 300</td>
<td><input name="newsettings[image_maxwidth]"
value="{value_image_maxwidth}"></td>
</tr>
<tr class="row_off">
Modified: branches/dev-syncromind/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_edit.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/booking/templates/base/event_edit.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -568,11 +568,17 @@
<div class="form-buttons">
<input type="submit" class="pure-button
pure-button-primary">
<xsl:attribute name="value">
- <xsl:value-of
select="php:function('lang', 'Send')"/>
+ <xsl:value-of
select="php:function('lang', 'approve')"/>
</xsl:attribute>
</input>
<a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href">
+ <xsl:value-of
select="event/application_link"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'back')" />
+ </a>
+ <a class="cancel pure-button pure-button-primary">
+ <xsl:attribute name="href">
<xsl:value-of
select="event/cancel_link"/>
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Cancel')" />
Index: branches/dev-syncromind/bookingfrontend
===================================================================
--- branches/dev-syncromind/bookingfrontend 2018-01-20 12:44:47 UTC (rev
17655)
+++ branches/dev-syncromind/bookingfrontend 2018-01-20 12:51:21 UTC (rev
17656)
Property changes on: branches/dev-syncromind/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16846
-/branches/stavangerkommune/bookingfrontend:9468-12740,12986
\ No newline at end of property
+/branches/stavangerkommune/bookingfrontend:9468-12740,12986
+/trunk/bookingfrontend:17484-17654
\ No newline at end of property
Modified: branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -29,7 +29,7 @@
if (!$types)
{
- $types = array('building', 'resource');//default
+ $types = array('building', 'resource',
'organization');//default
}
if ($type = phpgw::get_var('type', 'string', 'REQUEST',
null))
@@ -67,7 +67,7 @@
$_filter_building['id'] = $building_id;
}
-// if(in_array('building', $types))
+ if(in_array('building', $types))
{
$bui_result =
$this->sobuilding->read(array("query" => $searchterm, "sort" => "name",
@@ -107,7 +107,7 @@
}
}
-// if(in_array('resource', $types))
+ if(in_array('resource', $types))
{
$_filter_resource = array("active" => "1");
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -27,12 +27,14 @@
$this->redirect(array('menuaction' =>
'bookingfrontend.uisearch.index'));
}
- if ($_SERVER['REQUEST_METHOD'] == 'POST' &&
$_POST['comment'])
+ $comment = phpgw::get_var('comment', 'string', 'POST');
+
+ if ($_SERVER['REQUEST_METHOD'] == 'POST' && $comment)
{
- $this->add_comment($application,
$_POST['comment']);
+ $this->add_comment($application, $comment);
$this->set_display_in_dashboard($application,
true, array('force' => true));
$application['frontend_modified'] = 'now';
-
$this->bo->send_admin_notification($application, $_POST['comment']);
+
$this->bo->send_admin_notification($application, $comment);
$receipt = $this->bo->update($application);
$this->redirect(array('menuaction' =>
$this->url_prefix . '.show', 'id' => $application['id'],
Modified: branches/dev-syncromind/bookingfrontend/setup/default_records.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/setup/default_records.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/setup/default_records.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -27,7 +27,8 @@
$preferences = createObject('phpgwapi.preferences');
$preferences->set_account_id($bookingguest);
- $preferences->add('common', 'template_set', 'bookingfrontend');
+ // $preferences->add('common', 'template_set', 'bookingfrontend');
+ $preferences->add('common', 'template_set', 'aalesund');
$preferences->save_repository(true, $GLOBALS['type']);
$config = CreateObject('phpgwapi.config', 'bookingfrontend');
Modified: branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang 2018-01-20
12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang 2018-01-20
12:51:21 UTC (rev 17656)
@@ -398,4 +398,35 @@
please select an activity bookingfrontend no Velg en aktivitet
select date bookingfrontend no Velg dato
cancel event bookingfrontend no Avbestill
-free bookingfrontend no Ledig
\ No newline at end of file
+free bookingfrontend no Ledig
+bookingfrontend settings bookingfrontend no Bookingfrontend
innstillinger
+site title bookingfrontend no Tittel på siden
+footer info bookingfrontend no Footer informasjon
+remote authentication bookingfrontend no Ekstern autentisering
+select method bookingfrontend no Velg metode
+use cookies to pass sessionid bookingfrontend no Bruk cookie til å
håndtere sesjoner
+cookie domain for sessions bookingfrontend no Cookiedomene for
sesjoner
+if same as framework leave empty bookingfrontend no la stå tomt
dersom det er det samme som for rammeverket
+anonymous user bookingfrontend no Anonym bruker
+anonymous password bookingfrontend no Anonymt passord
+custom login url bookingfrontend no Egendefinert logg inn url
+custom login url parameter bookingfrontend no Egendefinert logg inn
url parametre
+login apikey bookingfrontend no login apikey
+login webservicehost bookingfrontend no login webservicehost
+login header key bookingfrontend no Innloggingsoverskrift:
+login header regular expression bookingfrontend no
Innloggingsoverskrift vanlig uttrykk
+login soap client location bookingfrontend no login soap klient
location
+login soap client uri bookingfrontend no login soap klient uri
+login soap client proxy host bookingfrontend no login soap klient
proxyserver
+login soap client proxy port bookingfrontend no login soap klient
proxyport
+login soap client encoding bookingfrontend no login soap klient
tegnsett
+login soap client login bookingfrontend no login soap klient login
+login soap client password bookingfrontend no login soap klient
passord
+login soap client wsdl bookingfrontend no login soap klient wsdl
+test organization bookingfrontend no Test organisasjon
+google tracker id bookingfrontend no Goggle sporer id
+url to external logout bookingfrontend no Url for ekstern logg ut
+Redirect is computed if url ends with bookingfrontend no Omdirigering
blir kalkulert hvis url slutter med
+bookingfrontend host bookingfrontend no Bookingfrontend vert
+Needed for the return from the external logout bookingfrontend no
Nødvendig for retur fra ekstern logg ut
+metadata settings bookingfrontend no Metadata innstillinger
Modified:
branches/dev-syncromind/bookingfrontend/templates/aalesund/application.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/aalesund/application.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/templates/aalesund/application.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -133,7 +133,7 @@
<div class="col-lg-12 application-group bg-light">
<div class="col-lg-12">
- <div class="heading">1. <xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></div>
<xsl:for-each select="application/comments[author]">
<xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/>
@@ -197,7 +197,7 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">2. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'Why?')" /></div>
<xsl:value-of select="php:function('lang',
'Activity')" />
@@ -221,7 +221,7 @@
<!-- Steg 3 -->
<div class="col-lg-12 application-group bg-light">
- <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'Where?')" /></div>
<xsl:value-of select="php:function('lang',
'Building')" />
<xsl:value-of select="application/building_name"/>
@@ -242,7 +242,7 @@
<!-- Steg 4 -->
<div class="col-lg-12 application-group bg-light">
- <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'When?')" /></div>
<script type="text/javascript">
var allocationParams = {};
var bookingParams = {};
@@ -300,7 +300,7 @@
<!-- Steg 5 -->
<div class="col-lg-12 application-group bg-light">
- <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'Who?')" /></div>
<xsl:value-of select="php:function('lang', 'Target
audience')" />
@@ -357,7 +357,7 @@
<!-- Steg 6 -->
<div class="col-lg-12 application-group bg-light">
<dl class="form-col">
- <div class="heading">6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
<dt>
<label for="field_contact_name">
<xsl:value-of select="php:function('lang',
'Name')" />
@@ -388,7 +388,7 @@
<!-- Steg 7 -->
<div class="col-lg-12 application-group bg-light">
<dl class="form-col">
- <div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
+ <div class="heading"><xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
<xsl:if test="application/customer_identifier_type
= 'organization_number'">
<dt>
<label for="field_organization_number">
@@ -416,7 +416,7 @@
<div class="col-lg-12 application-group bg-light">
<div class="heading">
- <br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" />
+ <br /><xsl:value-of
select="php:function('lang', 'Terms and conditions')" />
</div>
<xsl:if test="config/application_terms">
<p>
Modified:
branches/dev-syncromind/bookingfrontend/templates/aalesund/application_new.xsl
===================================================================
---
branches/dev-syncromind/bookingfrontend/templates/aalesund/application_new.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++
branches/dev-syncromind/bookingfrontend/templates/aalesund/application_new.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -22,7 +22,9 @@
<!-- Steg 1 -->
<div class="col-lg-12 application-group bg-light">
- <div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang',
'Why?')" />
+ </div>
<div class="form-group">
<label for="field_activity">
@@ -100,7 +102,9 @@
<!-- Steg 2-->
<div class="col-lg-12 application-group bg-light">
- <div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang', 'How
many?')" />
+ </div>
<xsl:if test="config/application_howmany">
<p>
<xsl:value-of
select="config/application_howmany"/>
@@ -171,7 +175,9 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang',
'Where?')" />
+ </div>
<xsl:if test="config/application_where">
<p>
<xsl:value-of
select="config/application_where"/>
@@ -234,120 +240,111 @@
<!-- Steg 4-->
<div class="col-lg-12 application-group bg-light">
-
- <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- <xsl:if test="config/application_when">
- <p>
- <xsl:value-of
select="config/application_when"/>
- </p>
- </xsl:if>
- <div class="form-group">
- <input type="hidden" class="form-control col-lg-4
col-md-7 col-sm-12" data-validation="application_dates">
- <xsl:attribute
name="data-validation-error-msg">
- <xsl:value-of select="php:function('lang',
'Invalid date')" />
- </xsl:attribute>
- </input>
- <xsl:for-each select="application/dates">
- <xsl:variable name="index"
select="position()-2" />
- <xsl:choose>
- <xsl:when test="position() > 1">
- <div class="date-container">
- <a href="javascript:void(0);"
class="close-btn btnclose">
- <xsl:value-of
select="php:function('lang', 'remove date')" />
- </a>
-
- <label for="start_date_{$index}">
- <xsl:value-of
select="php:function('lang', 'From')" />
- </label>
-
- <input class="newaddedpicker
form-control col-lg-4 col-md-7 col-sm-12" id="start_date_{$index}" type="text"
name="from_[]">
- <xsl:attribute name="value">
- <xsl:value-of
select="from_" />
- </xsl:attribute>
- <xsl:attribute name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
- </input>
-
-
- <label for="end_date_{$index}">
- <xsl:value-of
select="php:function('lang', 'To')" />
- </label>
-
-
- <input class="newaddedpicker
form-control col-lg-4 col-md-7 col-sm-12" id="end_date_{$index}" type="text"
name="to_[]">
- <xsl:attribute name="value">
- <xsl:value-of
select="to_"/>
- </xsl:attribute>
- <xsl:attribute name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
- </input>
-
- </div>
- </xsl:when>
-
-
- <xsl:otherwise>
- <div class="form-group">
-
- <a href="javascript:void(0);"
class="">
- <xsl:value-of
select="php:function('lang', 'remove date')" />
- </a>
-
- <br/>
-
-
- <div class="form-group col-lg-4
col-md-7 col-sm-12 no-padding-left">
- <label for="start_date">
- <xsl:value-of
select="php:function('lang', 'From')" />
- </label>
-
-
-
-
- <input class="form-control"
id="start_date" type="text" name="from_[]">
- <xsl:attribute
name="value">
- <xsl:value-of
select="from_" />
- </xsl:attribute>
- <xsl:attribute
name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
- </input>
+ <div class="heading"> <xsl:value-of
select="php:function('lang', 'When?')" /></div>
+ <xsl:if test="config/application_when">
+ <p><xsl:value-of
select="config/application_when"/></p>
+ </xsl:if>
+
+ <div class="form-group" id="dates-container">
+ <input type="hidden" class="form-control"
data-validation="application_dates">
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of
select="php:function('lang', 'Invalid date')" />
+ </xsl:attribute>
+ </input>
+ <input type="hidden" id="date_format" />
+ <xsl:for-each select="application/dates">
+ <xsl:variable name="index"
select="position()-2"/>
+ <xsl:choose>
+ <xsl:when test="position() > 1">
+ <div class="date-container">
+ <a href="javascript:void(0);"
class="btnclose">
+ <xsl:value-of
select="php:function('lang', 'Remove date')" />
+ </a>
+ <div class="form-group">
+ <label
for="start_date_{$index}">
+ <xsl:value-of
select="php:function('lang', 'From')" />
+ </label>
+ <input
class="newaddedpicker datetime form-control" id="start_date_{$index}"
type="text" name="from_[]">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="from_" />
+ </xsl:attribute>
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="form-group">
+ <label
for="end_date_{$index}">
+ <xsl:value-of
select="php:function('lang', 'To')" />
+ </label>
+ <xsl:if
test="activity/error_msg_array/end_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="activity/error_msg_array/end_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <input
class="newaddedpicker datetime form-control" id="end_date_{$index}" type="text"
name="to_[]">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="to_"/>
+ </xsl:attribute>
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
</div>
-
- <div class="form-group col-lg-4
col-md-7 col-sm-12 no-padding-left">
- <label for="end_date">
- <xsl:value-of
select="php:function('lang', 'To')" />
- </label>
-
-
- <input class="form-control"
id="end_date" type="text" name="to_[]">
- <xsl:attribute
name="value">
- <xsl:value-of
select="to_"/>
- </xsl:attribute>
- <xsl:attribute
name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
-
- </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="date-container">
+ <a href="javascript:void(0);"
class="btnclose">
+ <xsl:value-of
select="php:function('lang', 'Remove date')" />
+ </a>
+ <div class="form-group">
+ <label for="start_date">
+ <xsl:value-of
select="php:function('lang', 'From')" />
+ </label>
+ <input class="datetime
form-control" id="start_date" type="text" name="from_[]">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="from_"/>
+ </xsl:attribute>
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="form-group">
+ <label for="end_date">
+ <xsl:value-of
select="php:function('lang', 'To')" />
+ </label>
+ <xsl:if
test="activity/error_msg_array/end_date != ''">
+ <xsl:variable
name="error_msg">
+ <xsl:value-of
select="activity/error_msg_array/end_date" />
+ </xsl:variable>
+ <div
class='input_error_msg'>
+ <xsl:value-of
select="php:function('lang', $error_msg)" />
+ </div>
+ </xsl:if>
+ <input class="datetime
form-control" id="end_date" type="text" name="to_[]">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="to_"/>
+ </xsl:attribute>
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
</div>
- </div>
- <!--div id="dtBox"></div-->
- </xsl:otherwise>
-
-
-
- </xsl:choose>
- </xsl:for-each>
- </div>
-
- <a href="javascript:void(0);" id="add-date-link">
- <xsl:value-of select="php:function('lang', 'Add
another date')" />
- </a>
-
-
-
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </div>
+ <div class="pure-control-group">
+ <a href="javascript:void(0);"
id="add-date-link">
+ <xsl:value-of select="php:function('lang',
'Add another date')" />
+ </a>
+ </div>
</div>
@@ -356,7 +353,9 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang',
'Who?')" />
+ </div>
<xsl:if test="config/application_who">
<p>
<xsl:value-of select="config/application_who"/>
@@ -402,7 +401,9 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang',
'Contact information')" />
+ </div>
<xsl:if test="config/application_contact_information">
<p>
<xsl:value-of
select="config/application_contact_information"/>
@@ -491,7 +492,9 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang',
'responsible applicant')" /> / <xsl:value-of select="php:function('lang',
'invoice information')" />
+ </div>
<xsl:if
test="config/application_responsible_applicant">
<p>
<xsl:value-of
select="config/application_responsible_applicant"/>
@@ -511,7 +514,9 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang', 'Terms
and conditions')" />
+ </div>
<input type="hidden"
data-validation="regulations_documents">
<xsl:attribute name="data-validation-error-msg">
<xsl:value-of select="php:function('lang',
'You must accept to follow all terms and conditions of lease first')" />
@@ -537,7 +542,9 @@
<div class="col-lg-12 application-group bg-light">
- <div class="heading">9. <xsl:value-of
select="php:function('lang', 'Attachment')" /></div>
+ <div class="heading">
+ <xsl:value-of select="php:function('lang',
'Attachment')" />
+ </div>
<label for="field_name">
Modified:
branches/dev-syncromind/bookingfrontend/templates/aalesund/building.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/aalesund/building.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/templates/aalesund/building.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -132,28 +132,52 @@
</div>
<div class="col-lg-5">
- <dl class="images">
- <div id="images_container">
+ <dl class="images">
+ <div id="images_container">
- </div>
- </dl>
- <dl class="images map">
- <!--div id="images_container"></div-->
- <xsl:if test="street and normalize-space(street)">
- <div class="gmap-container">
- <iframe width="500" height="300" frameborder="0"
scrolling="no" marginheight="0" marginwidth="0" id="googlemapiframe"
src=""></iframe>
</div>
- <small>
- <a href="" id="googlemaplink"
style="color:#0000FF;text-align:left" target="_new">Vis større kart</a>
- </small>
- </xsl:if>
- </dl>
+ </dl>
+ <dl class="images map">
+ <!--div id="images_container"></div-->
+ <xsl:if test="street and normalize-space(street)">
+ <div class="gmap-container">
+ <iframe width="500" height="300"
frameborder="0" scrolling="no" marginheight="0" marginwidth="0"
id="googlemapiframe" src=""></iframe>
+ </div>
+ <small>
+ <a href="" id="googlemaplink"
style="color:#0000FF;text-align:left" target="_new">Vis større kart</a>
+ </small>
+ </xsl:if>
+ </dl>
</div>
- </div>
+ </div>
+
+
+ <div class="modal fade" id="mediaModal" role="dialog">
+ <div class="modal-dialog modal-xl">
+ <!-- Content of modal -->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close"
data-dismiss="modal">x</button>
+ <h4 class="modal-title" id="mediaTitle"></h4>
+ </div>
+ <div class="modal-body" id="fullSizeImage">
+
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-danger"
data-dismiss="modal">Avslutt</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
- <script type="text/javascript">
+ <script type="text/javascript">
var building_id = <xsl:value-of select="id"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Category', 'Activity', 'Resource Type')"/>;
var address = '<xsl:value-of select="street"/>, <xsl:value-of
select="zip_code"/>, <xsl:value-of select="city"/>';
@@ -194,7 +218,8 @@
</script>
</xsl:for-each>
-
+
+
</div>
</xsl:template>
Modified:
branches/dev-syncromind/bookingfrontend/templates/aalesund/organization.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/aalesund/organization.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/templates/aalesund/organization.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -140,6 +140,26 @@
</dl>
</div>
</div>
+
+ <div class="modal fade" id="mediaModal" role="dialog">
+ <div class="modal-dialog modal-xl">
+ <!-- Content of modal -->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close"
data-dismiss="modal">x</button>
+ <h4 class="modal-title" id="mediaTitle"></h4>
+ </div>
+ <div class="modal-body" id="fullSizeImage">
+
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-danger"
data-dismiss="modal">Avslutt</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
<script type="text/javascript">
var organization_id = <xsl:value-of select="organization/id"/>;
Modified:
branches/dev-syncromind/bookingfrontend/templates/aalesund/resource.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/aalesund/resource.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/templates/aalesund/resource.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -81,6 +81,26 @@
</dl>
</div>
</div>
+
+ <div class="modal fade" id="mediaModal" role="dialog">
+ <div class="modal-dialog modal-xl">
+ <!-- Content of modal -->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close"
data-dismiss="modal">x</button>
+ <h4 class="modal-title" id="mediaTitle"></h4>
+ </div>
+ <div class="modal-body" id="fullSizeImage">
+
+
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-danger"
data-dismiss="modal">Avslutt</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
<script type="text/javascript">
var resource_id = <xsl:value-of select="resource/id"/>;
Modified: branches/dev-syncromind/bookingfrontend/templates/aalesund/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/aalesund/search.xsl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/templates/aalesund/search.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -7,14 +7,17 @@
<a href="#" class="scrollup">
<xsl:value-of select="php:function('lang', 'scroll to top')" />
</a>
- <div class="jumbotron text-center">
+ <div class="jumbotron">
- <div class="container header-text">
- <a href="{site_url}"><p>AKTIV KOMMUNE</p>
- <h2>Ålesund</h2></a>
+ <div class="header-text">
+ <a href="{site_url}">
+ <p class="header-style-m">Din portal til</p>
+ <p class="header-style-l">AKTIVITETER OG LOKALER</p>
+ <p class="header-style-m">Nært deg.</p>
+ </a>
</div>
</div>
- <div class="container-fluid main-container">
+ <div class="container-fluid main-container" id="main-page">
<section class="text-center">
<div class="container-fluid">
@@ -51,7 +54,7 @@
<span class="input-group-btn">
<button class="btn btn-default search-button"
id="submit_searchterm" type="submit">
- <i class="icon ion-search text-primary"/>
+ <i class="icon ion-search"/>
</button>
</span>
@@ -72,7 +75,7 @@
</xsl:attribute>
</input> -->
- <p id="adv-search-toggler" class="adv-search-button
text-right text-primary">Avansert søk</p>
+ <p id="adv-search-toggler" class="adv-search-button
text-right">Avansert søk</p>
</div>
</div>
@@ -188,7 +191,9 @@
</div>
</div>
- <button id="update-search-result" class="btn btn-primary">Oppdater
resultat</button>
+ <button id="update-search-result" class="btn btn-main">
+ <xsl:value-of select="php:function('lang', 'Update results')"
/>
+ </button>
</div>
Modified: branches/dev-syncromind/bookingfrontend/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/config.tpl
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/bookingfrontend/templates/base/config.tpl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -38,7 +38,7 @@
</td>
</tr>
<tr class="row_on">
-
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
+ <td>{lang_cookie_domain_for_sessions} -
{lang_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
</tr>
<tr class="row_off">
@@ -124,13 +124,13 @@
</tr>
<tr class="row_off">
<td>{lang_url_to_external_logout}:
- <br/> Redirect is computed if url ends with '='
+ <br/>
{lang_Redirect_is_computed_if_url_ends_with} '='
</td>
<td><input name="newsettings[external_logout]"
value="{value_external_logout}"></td>
</tr>
<tr class="row_off">
<td>{lang_bookingfrontend_host}:
- <br/> Needed for the return from the
external_logout
+ <br/>
{lang_Needed_for_the_return_from_the_external_logout}
</td>
<td><input name="newsettings[bookingfrontend_host]"
value="{value_bookingfrontend_host}"></td>
</tr>
Modified: branches/dev-syncromind/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicalendar.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/controller/inc/class.uicalendar.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -57,13 +57,18 @@
private $so_check_list;
private $so_check_item;
private $location_finder;
+ var $type_id;
+ private $bo;
+ private $bocommon;
public $public_functions = array
(
'view_calendar_for_month' => true,
'view_calendar_for_year' => true,
+ 'view_calendar_for_year2' => true,
'view_calendar_year_for_locations' => true,
'view_calendar_month_for_locations' => true,
- 'update_bookmark' => true
+ 'update_bookmark' => true,
+ 'query' => true
);
public function __construct()
@@ -76,6 +81,10 @@
$delete = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_DELETE, 'controller'); //8
$manage = $GLOBALS['phpgw']->acl->check('.control', 16,
'controller'); //16
+
+ $this->bo = CreateObject('property.bolocation', true);
+ $this->bocommon = & $this->bo->bocommon;
+ $this->type_id = $this->bo->type_id;
$this->so = CreateObject('controller.socheck_list');
$this->so_control =
CreateObject('controller.socontrol');
@@ -475,7 +484,301 @@
self::render_template_xsl('calendar/calendar_year_no_loc', $data);
}
}
+
+ public function view_calendar_for_year2($location_array = null,
$year = null)
+ {
+ //$location_array = phpgw::get_var('location_array');
+ //_debug_array($location_array['data']);
+// if(!empty($location_array))
+// {
+// _debug_array($location_array['data']);
+//// foreach ($location_array as $loc_no => $currval)
+//// {
+//// var_dump($loc_no);
+//// }
+// }
+//
+ $location_code = phpgw::get_var('location_code');
+ if($year == null)
+ $year = phpgw::get_var('year');
+ $role = phpgw::get_var('role', 'int');
+ $repeat_type = phpgw::get_var('repeat_type');
+
+ //show only controls that are not done
+ $selected_ctrl_status =
phpgw::get_var('current_ctrl_status');
+
+ // Validates year. If year is not set, current year is
chosen
+ $year = $this->validate_year($year);
+
+ // Validates repeat type.
+ $repeat_type =
$this->validate_repeat_type($repeat_type);
+
+ // Validates role.
+// $role = $this->validate_role($role);
+ // Gets timestamp of first day in year
+ $from_date_ts = $this->get_start_date_year_ts($year);
+
+ // Gets timestamp of first day in next year
+ $to_date_ts = $this->get_end_date_year_ts($year);
+
+ // Array that will be populated with controls and
calendar objects that will be sent to view
+ $controls_calendar_array = array();
+
+ // Validates location_code. If not set, first location
among assigned locations
+ $location_code =
$this->validate_location_code($location_code);
+
+// if ($location_code != null && $location_code != "")
+// {
+ if(is_array($location_array))
+ {
+ $locations_with_control = array();
+ foreach ($location_array as $loc_code
=>&$curr_pos)
+ {
+ $curr_pos['location_code'] = $loc_code;
+ //_debug_array($curr_pos);
+ }
+
+ foreach ($location_array as $curr_loc)
+ {
+ //$curr = array();
+ //$curr['location_code'] =
$curr_loc['location_code'];
+ //$curr['controls_calendar_array'] =
$curr_loc['controls_calendar_array'];
+
if(is_array($curr_loc['controls_calendar_array']) &&
!empty($curr_loc['controls_calendar_array']))
+ {
+ $locations_with_control[] =
$curr_loc;
+ }
+ }
+ //_debug_array($locations_with_control);
+
+ $heading_array =
year_calendar::get_heading_array();
+// _debug_array($heading_array);
+
+ $roles_array = $this->so_control->get_roles();
+
+ $repeat_type_array = array(
+ array('id' => "0", 'value' => "Dag"),
+ array('id' => "1", 'value' => "Uke"),
+ array('id' => "2", 'value' => "Måned"),
+ array('id' => "3", 'value' => "År")
+ );
+
+ $ctrl_status_array = array(
+ array('id' => "CONTROL_REGISTERED",
'value' => "CONTROL_REGISTERED"),
+ array('id' => "CONTROL_PLANNED",
'value' => "CONTROL_PLANNED"),
+ array('id' =>
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS", 'value' =>
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS"),
+ array('id' =>
"CONTROL_DONE_IN_TIME_WITHOUT_ERRORS", 'value' =>
"CONTROL_DONE_IN_TIME_WITHOUT_ERRORS"),
+ array('id' =>
"CONTROL_DONE_WITH_ERRORS", 'value' => "CONTROL_DONE_WITH_ERRORS"),
+ array('id' => "CONTROL_NOT_DONE",
'value' => "CONTROL_NOT_DONE"),
+ //array('id' =>
"CONTROL_NOT_DONE_WITH_PLANNED_DATE", 'value' =>
"CONTROL_NOT_DONE_WITH_PLANNED_DATE"),
+ array('id' => "CONTROL_CANCELED",
'value' => "CONTROL_CANCELED")
+ );
+
+
$GLOBALS['phpgw']->translation->add_app('property');
+
+ $district_list =
$this->bocommon->select_district_list('filter', $this->district_id);
+
+ $part_of_town_list =
execMethod('property.bogeneric.get_list', array('type' => 'part_of_town',
+ 'selected' => $part_of_town_id));
+ $location_type_list =
execMethod('property.soadmin_location.select_location_type');
+
+ array_unshift($district_list, array('id' => '',
'name' => lang('select')));
+ array_unshift($part_of_town_list, array('id' =>
'', 'name' => lang('select')));
+ array_unshift($location_type_list, array('id'
=> '', 'name' => lang('select')));
+
+
+ $data = array
+ (
+ 'heading_array' => $heading_array,
+ 'location_calendar_array' =>
$locations_with_control,
+ 'roles_array' => $roles_array,
+ 'repeat_type_array' =>
$repeat_type_array,
+ 'ctrl_status_array' =>
$ctrl_status_array,
+ 'current_year' => $year,
+ 'multiple_locations' => 'yes',
+ 'filter_form' => array
+ (
+ 'district_list' =>
array('options' => $district_list),
+ 'part_of_town_list' =>
array('options' => $part_of_town_list),
+ 'location_type_list' =>
array('options' => $location_type_list),
+ ),
+ 'update_action' =>
self::link(array('menuaction' => 'controller.uicalendar.query'))
+ );
+
+ phpgwapi_jquery::load_widget('autocomplete');
+ self::add_javascript('controller',
'controller', 'ajax.js');
+ self::add_javascript('controller',
'controller', 'ajax_calendar_for_locations.js');
+
+
self::render_template_xsl(array('calendar/view_calendar_aggregated',
'calendar/check_list_status_manager',
+ 'calendar/icon_color_map',
'calendar/nav_calendar_year',
+ 'calendar/calendar_filters'), $data);
+ }
+ else
+ {
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] =
true;
+ $receipt = array();
+
+ if (phpgw::get_var('phpgw_return_as') == 'json')
+ {
+ return $this->query();
+ }
+
+ $msgbox_data = array();
+ if (phpgw::get_var('phpgw_return_as') != 'json'
&& $receipt = phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
+ {
+
phpgwapi_cache::session_clear('phpgwapi', 'phpgw_messages');
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+ }
+
+
$GLOBALS['phpgw']->translation->add_app('property');
+
+ $district_list =
$this->bocommon->select_district_list('filter', $this->district_id);
+
+ $part_of_town_list =
execMethod('property.bogeneric.get_list', array('type' => 'part_of_town',
+ 'selected' => $part_of_town_id));
+ $location_type_list =
execMethod('property.soadmin_location.select_location_type');
+
+ array_unshift($district_list, array('id' => '',
'name' => lang('select')));
+ array_unshift($part_of_town_list, array('id' =>
'', 'name' => lang('select')));
+ array_unshift($location_type_list, array('id'
=> '', 'name' => lang('select')));
+
+
+ $data = array
+ (
+ 'msgbox_data' => $msgbox_data,
+ 'filter_form' => array
+ (
+ 'district_list' =>
array('options' => $district_list),
+ 'part_of_town_list' =>
array('options' => $part_of_town_list),
+ 'location_type_list' =>
array('options' => $location_type_list),
+ ),
+ 'update_action' =>
self::link(array('menuaction' => 'controller.uicalendar.query'))
+ );
+
+ self::add_javascript('controller',
'controller', 'ajax_calendar_for_locations.js');
+
+
self::render_template_xsl(array('calendar/view_calendar_aggregated'), $data);
+ }
+ }
+
+ public function get_location_calendar_for_year($location_code,
$year = null)
+ {
+ $role = phpgw::get_var('role', 'int');
+ $repeat_type = phpgw::get_var('repeat_type');
+
+ //show only controls that are not done
+ $selected_ctrl_status =
phpgw::get_var('current_ctrl_status');
+
+ // Validates year. If year is not set, current year is
chosen
+ $year = $this->validate_year($year);
+
+ // Validates repeat type.
+ $repeat_type =
$this->validate_repeat_type($repeat_type);
+
+ // Gets timestamp of first day in year
+ $from_date_ts = $this->get_start_date_year_ts($year);
+
+ // Gets timestamp of first day in next year
+ $to_date_ts = $this->get_end_date_year_ts($year);
+
+ // Array that will be populated with controls and
calendar objects that will be sent to view
+ $controls_calendar_array = array();
+
+ // Validates location_code. If not set, first location
among assigned locations
+ $location_code =
$this->validate_location_code($location_code);
+
+ $level =
$this->location_finder->get_location_level($location_code);
+
+ $user_role = true;
+
+ // Fetches buildings on property
+ $buildings_on_property =
$this->location_finder->get_buildings_on_property($user_role, $location_code,
$level);
+
+ // Fetches all controls for the location within time
period
+ $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type, "return_object", $role);
+
+ // Loops through controls with repeat type day or week
+ // and populates array that contains aggregated open
cases pr month.
+ foreach ($controls_for_location_array as $control)
+ {
+ if ($control->get_repeat_type() ==
controller_control::REPEAT_TYPE_DAY | $control->get_repeat_type() ==
controller_control::REPEAT_TYPE_WEEK)
+ {
+ $cl_criteria = new
controller_check_list();
+
$cl_criteria->set_control_id($control->get_id());
+
$cl_criteria->set_location_code($location_code);
+
+ $from_month =
$this->get_start_month_for_control($control);
+ $to_month =
$this->get_end_month_for_control($control);
+
+ // Loops through controls and populates
aggregate open cases pr month array.
+ $agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($cl_criteria, $year, $from_month,
$to_month);
+
+ $year_calendar_agg = new
year_calendar_agg($control, $year, $location_code,
"VIEW_CONTROLS_FOR_LOCATION");
+ $calendar_array =
$year_calendar_agg->build_calendar($agg_open_cases_pr_month_array);
+
+ $controls_calendar_array[] =
array("control" => $control->toArray(), "calendar_array" => $calendar_array);
+ }
+ }
+
+ $repeat_type_expr = ">=2";
+ // Fetches control ids with check lists for specified
time period
+ $control_id_with_check_list_array =
$this->so->get_check_lists_for_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type_expr);
+
+ // Loops through all controls for location and
populates controls with check lists
+ $controls_for_location_array =
$this->populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array);
+
+ foreach ($controls_for_location_array as $control)
+ {
+ if ($control->get_repeat_type() ==
controller_control::REPEAT_TYPE_MONTH | $control->get_repeat_type() ==
controller_control::REPEAT_TYPE_YEAR)
+ {
+ $year_calendar = new
year_calendar($control, $year, null, $location_code, "location");
+ $calendar_array =
$year_calendar->build_calendar($control->get_check_lists_array(),
$selected_ctrl_status);
+
+ $controls_calendar_array[] =
array("control" => $control->toArray(), "calendar_array" => $calendar_array);
+ }
+ }
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
+ // Gets array of locations assigned to current user
+ $my_locations =
$this->get_my_assigned_locations($location_code);
+
+ $heading_array = year_calendar::get_heading_array();
+
+ $roles_array = $this->so_control->get_roles();
+
+ $repeat_type_array = array(
+ array('id' => "0", 'value' => "Dag"),
+ array('id' => "1", 'value' => "Uke"),
+ array('id' => "2", 'value' => "Måned"),
+ array('id' => "3", 'value' => "År")
+ );
+
+ $ctrl_status_array = array(
+ array('id' => "CONTROL_REGISTERED", 'value' =>
"CONTROL_REGISTERED"),
+ array('id' => "CONTROL_PLANNED", 'value' =>
"CONTROL_PLANNED"),
+ array('id' =>
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS", 'value' =>
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS"),
+ array('id' =>
"CONTROL_DONE_IN_TIME_WITHOUT_ERRORS", 'value' =>
"CONTROL_DONE_IN_TIME_WITHOUT_ERRORS"),
+ array('id' => "CONTROL_DONE_WITH_ERRORS",
'value' => "CONTROL_DONE_WITH_ERRORS"),
+ array('id' => "CONTROL_NOT_DONE", 'value' =>
"CONTROL_NOT_DONE"),
+ //array('id' =>
"CONTROL_NOT_DONE_WITH_PLANNED_DATE", 'value' =>
"CONTROL_NOT_DONE_WITH_PLANNED_DATE"),
+ array('id' => "CONTROL_CANCELED", 'value' =>
"CONTROL_CANCELED")
+ );
+
+ $data = array
+ (
+ 'heading_array' => $heading_array,
+ 'controls_calendar_array' =>
$controls_calendar_array,
+ 'roles_array' => $roles_array,
+ 'repeat_type_array' => $repeat_type_array,
+ 'ctrl_status_array' => $ctrl_status_array,
+ 'current_year' => $year
+ );
+
+ return $data;
+ }
+
public function view_calendar_year_for_locations()
{
static $_location_name = array();
@@ -1163,7 +1466,64 @@
public function query()
{
+ $year = date('Y');
+ $from_date_ts = mktime(0, 0, 0, 1, 1, $year);
+ $to_date_ts = mktime(0, 0, 0, 1, 1, $year+1);
+ $loc_array = array();
+ $loc_checklist_array = array();
+
+ $params = array(
+ 'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'allrows' => true,
+ 'district_id' => phpgw::get_var('district_id',
'int'),
+ 'cat_id' => phpgw::get_var('cat_id', 'int'),
+ 'status' => phpgw::get_var('status'),
+ 'part_of_town_id' =>
phpgw::get_var('part_of_town_id', 'int'),
+ 'location_code' =>
phpgw::get_var('location_code'),
+ 'type_id' => phpgw::get_var('location_level',
'int', 'REQUEST', 1)
+ );
+
+ $values = $this->bo->read($params);
+
+ foreach ($values as &$entry)
+ {
+ $loc_array[] = $entry['location_code'];
+ }
+ foreach ($loc_array as $curr_loc)
+ {
+ //get checklists for found locations
+ $loc_checklist_array[$curr_loc] =
$this->get_location_calendar_for_year($curr_loc, $year);
+ $loc_checklist_array[$curr_loc]['loc_name'] =
$this->bo->get_location_name($curr_loc);
+
+ }
+
+ foreach ($loc_checklist_array as &$curr_loc_checklist)
+ {
+
if(empty($curr_loc_checklist['controls_calendar_array']))
+ {
+ $curr_loc_checklist = [];
+ }
+ }
+// _debug_array($loc_checklist_array);
+ //die();
+
+ $result_data = array
+ (
+ 'results' => $loc_checklist_array
+ );
+
+ $this->view_calendar_for_year2($loc_checklist_array,
$year);
+
+ //$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uicalendar.view_calendar_for_year2',
'location_array' => $loc_checklist_array));
+
+
+
+ //return $this->jquery_results($result_data);
+ //return $this->jquery_results($loc_checklist_array);
}
public function update_bookmark()
Modified: branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -2125,7 +2125,7 @@
{
$mail->Send();
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(),
'error');
}
@@ -2139,7 +2139,7 @@
{
$rc = $send->msg('email', $to_address,
$subject, $message, $msgtype = 'Ical', $cc = '', $bcc = '', $from_address,
$from_name, 'html', $mime_boundary);//, array($attachment));
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(), 'error');
}
Modified: branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -209,7 +209,7 @@
public function edit()
{
- //
phpgwapi_jquery::formvalidator_generate(array('location','date', 'security',
'file'));
+ //
phpgwapi_jquery::formvalidator_generate(array('location','date', 'security',
'file')); a
self::add_javascript('controller', 'controller',
'ajax.js');
$tabs = array
Copied:
branches/dev-syncromind/controller/js/controller/ajax_calendar_for_locations.js
(from rev 17654, trunk/controller/js/controller/ajax_calendar_for_locations.js)
===================================================================
---
branches/dev-syncromind/controller/js/controller/ajax_calendar_for_locations.js
(rev 0)
+++
branches/dev-syncromind/controller/js/controller/ajax_calendar_for_locations.js
2018-01-20 12:51:21 UTC (rev 17656)
@@ -0,0 +1,394 @@
+var myColumnDefs = new Array();
+var oTable = null;
+
+$(document).ready(function ()
+{
+ $("#location_type").change(function ()
+ {
+ get_table_def();
+
+ var oArgs = {menuaction:
'controller.uicontrol_register_to_location.get_location_type_category',
location_type: $(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "<option value=''>Velg</option>";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ var obj = data;
+
+ $.each(obj, function (i)
+ {
+ htmlString += "<option value='"
+ obj[i].id + "'>" + obj[i].name + "</option>";
+ });
+
+
$("#location_type_category").html(htmlString);
+ $("#loc1").html("<option
value=''>Velg</option>");
+ $("#loc2").html("<option
value=''>Velg</option>");
+ }
+ else
+ {
+ htmlString += "<option
value=''>Velg</option>";
+ $("#part_of_town_id").html(htmlString);
+ $("#loc1").html(htmlString);
+ $("#loc2").html(htmlString);
+ }
+ }
+ });
+ });
+
+ $("#location_type_category").change(function ()
+ {
+ var level = $("#location_type").val();
+ update_loc(level);
+ });
+
+ var oArgs = {menuaction: 'property.bolocation.get_locations_by_name'};
+ var baseUrl = phpGWLink('index.php', oArgs, true);
+ var location_type = 1;
+
+ //update part of town category based on district
+ $("#district_id").change(function ()
+ {
+ var district_id = $(this).val();
+ var oArgs = {menuaction:
'controller.uicontrol_register_to_location.get_district_part_of_town'};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl + "&district_id=" + district_id,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ var obj = JSON.parse(data);
+
+ $.each(obj, function (i)
+ {
+ htmlString += "<option value='"
+ obj[i].id + "'>" + obj[i].name + "</option>";
+ });
+
+ $("#part_of_town_id").html(htmlString);
+ $("#loc1").html("<option
value=''>Velg</option>");
+ $("#loc2").html("<option
value=''>Velg</option>");
+ }
+ else
+ {
+ htmlString += "<option
value=''>Velg</option>";
+ $("#part_of_town_id").html(htmlString);
+ $("#loc1").html(htmlString);
+ $("#loc2").html(htmlString);
+ }
+ }
+ });
+
+ $("#search-location_code").val('');
+ });
+
+
+ $("#part_of_town_id").change(function ()
+ {
+ var oArgs = {menuaction:
'controller.uicontrol_register_to_location.get_locations', child_level: 1,
part_of_town_id: $(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "<option value=''>Velg</option>";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ var obj = data;
+
+ $.each(obj, function (i)
+ {
+ htmlString += "<option value='"
+ obj[i].id + "'>" + obj[i].id + " " + obj[i].name + "</option>";
+ });
+
+ $("#loc1").html(htmlString);
+ $("#loc2").html("<option
value=''>Velg</option>");
+ }
+ else
+ {
+ htmlString = "<option>Ingen</option>";
+ $("#loc1").html(htmlString);
+ $("#loc2").html(htmlString);
+ }
+ }
+ });
+
+ $("#search-location_code").val('');
+ });
+
+ $("#loc1").change(function ()
+ {
+ var oArgs = {menuaction:
'controller.uicontrol_register_to_location.get_locations', child_level: 2,
location_code: $(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "<option value=''>Velg</option>";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ var obj = data;
+
+ $.each(obj, function (i)
+ {
+ htmlString += "<option value='"
+ obj[i].id + "'>" + obj[i].id + " " + obj[i].name + "</option>";
+ });
+
+ $("#loc2").html(htmlString);
+ }
+ else
+ {
+ htmlString = "<option>Ingen</option>";
+ $("#loc2").html(htmlString);
+ }
+ }
+ });
+
+ $("#search-location_code").val('');
+
+ });
+
+ $("#loc2").change(function ()
+ {
+ $("#search-location_code").val('');
+ update_location_table();
+ });
+
+
+
+ $("#search").click(function (e)
+ {
+ update_location_table();
+ });
+
+/*
+ * Display calendar based on selection
+ */
+ $("#acl_form").on("submit", function (e)
+ {
+ e.preventDefault();
+ //update_location_table();
+
+ var oArgs = {
+ menuaction: 'controller.uicalendar.query',
+ location_level: $("#location_type").val(),
+ cat_id: $("#location_type_category").val(),
+ district_id: $("#district_id").val(),
+ part_of_town_id: $("#part_of_town_id").val(),
+ //location_code: $("#loc1").val(),
+ };
+
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+ window.location.href = requestUrl;
+
+ //alert(requestUrl);
+
+/* $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data)
+ {
+ if (data.sessionExpired)
+ {
+ alert('Sesjonen er utløpt - du
må logge inn på nytt');
+ return;
+ }
+ var htmlString = "";
+ var obj = data;
+ //console.log(data);
+ $.each(obj, function (i, val)
+ {
+ if(val !== null)
+ {
+ //console.log(i);
+ //console.log(val);
+ var oArgs2 = {
+ menuaction:
'controller.uicalendar.view_calendar_for_year2',
+ location_level:
$("#location_type").val(),
+ cat_id:
$("#location_type_category").val(),
+ district_id:
$("#district_id").val(),
+
part_of_town_id: $("#part_of_town_id").val(),
+ location_array:
val,
+ }
+ var requestUrl2 =
phpGWLink('index.php', oArgs2, true);
+ window.location.href =
requestUrl2;
+ /*
+ $.each(val, function
(key, value)
+ {
+
if(!$.isEmptyObject(value))
+ {
+
htmlString += key + " " + val[key]['loc_name'] + "<br/>";
+ }
+ })
+ }
+ });
+
+ $("#receipt").html(htmlString);
+ }
+ }
+ });*/
+ });
+});
+
+
+function update_loc(level)
+{
+ var oArgs = {
+ menuaction: 'property.bolocation.read',
+ cat_id: $("#location_type_category").val(),
+ district_id: $("#district_id").val(),
+ part_of_town_id: $("#part_of_town_id").val(),
+ location_code: $("#loc1").val(),
+ type_id: level
+ };
+
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "<option value=''>Velg</option>";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ var obj = data;
+
+ $.each(obj, function (i)
+ {
+ htmlString += "<option value='" +
obj[i].location_code + "'>" + obj[i].location_code + " " + obj[i]["loc" + level
+ "_name"] + "</option>";
+ });
+
+ $("#loc" + level).html(htmlString);
+ if (level == 1)
+ {
+ $("#loc2").html("<option value=''>Velg
Eiendom først</option>");
+ }
+ if (level == 2)
+ {
+ $("#loc1").html("");
+ }
+ }
+ else
+ {
+ htmlString = "<option>Ingen</option>";
+ $("#loc1").html(htmlString);
+ $("#loc2").html(htmlString);
+ }
+ }
+ });
+
+
+
+}
+
+function get_table_def()
+{
+ var oArgs = {
+ menuaction:
'controller.uicontrol_register_to_location.get_entity_table_def',
+ location_level: $("#location_type").val()
+ };
+
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ if (data != null)
+ {
+ myColumnDefs = data;
+ init_component_table();
+ }
+ else
+ {
+ alert('error');
+ }
+ }
+ });
+
+}
+
+
+function init_component_table()
+{
+ var location_type = $("#location_type").val() != null ?
$("#location_type").val() : '';
+
+ if (!location_type)
+ {
+ return false;
+ }
+
+ var cat_id = $("#location_type_category").val() != null ?
$("#location_type_category").val() : '';
+
+ var control_registered = 0;
+ if ($("#control_registered").prop("checked"))
+ {
+ control_registered = 1;
+ }
+
+ var location_code = '';
+
+ if ($("#search-location_code").val() != null &&
$("#search-location_code").val())
+ {
+ location_code = $("#search-location_code").val();
+ }
+ else if ($("#loc2").val() != null && $("#loc2").val())
+ {
+ location_code = $("#loc2").val();
+ }
+ else if ($("#loc1").val() != null && $("#loc1").val())
+ {
+ location_code = $("#loc1").val();
+ }
+
+ var oArgs = {
+ menuaction: 'controller.uicalendar.query',
+ location_level: location_type,
+ district_id: $("#district_id").val(),
+ part_of_town_id: $("#part_of_town_id").val(),
+ cat_id: cat_id,
+ location_code: location_code
+ };
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ if (oTable)
+ {
+ api = oTable.api();
+ api.destroy();
+ }
+ $("#table_def").html('<table cellpadding="0" cellspacing="0" border="0"
id="datatable-container_0"></table>');
+ oTable = JqueryPortico.inlineTableHelper('datatable-container_0',
requestUrl, myColumnDefs);
+
+}
+
+function update_location_table()
+{
+ init_component_table();
+}
+
Copied:
branches/dev-syncromind/controller/templates/base/calendar/view_calendar_aggregated.xsl
(from rev 17654,
trunk/controller/templates/base/calendar/view_calendar_aggregated.xsl)
===================================================================
---
branches/dev-syncromind/controller/templates/base/calendar/view_calendar_aggregated.xsl
(rev 0)
+++
branches/dev-syncromind/controller/templates/base/calendar/view_calendar_aggregated.xsl
2018-01-20 12:51:21 UTC (rev 17656)
@@ -0,0 +1,450 @@
+<!--
+ Document : view_calendar_aggregated.xsl
+ Created on : 14. november 2017, 12:13
+ Author : Erik
+ Description:
+ Purpose of transformation follows.
+-->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="session_url"><xsl:text>&</xsl:text><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="serie_id"><xsl:value-of select="serie_id" /></xsl:variable>
+
+ <script>
+<xsl:text>
+
+$(document).ready(function(){
+
+ var oArgs = {menuaction:'property.bolocation.get_locations_by_name'};
+ var baseUrl = phpGWLink('index.php', oArgs, false);
+
+ var location_type = $("#loc_type").val();
+
+ $("#search-location-name").autocomplete({
+ source: function( request, response ) {
+ location_type = $("#loc_type").val();
+
+ $.ajax({
+ url: baseUrl,
+ dataType: "json",
+ data: {
+ location_name: request.term,
+ level: location_type,
+ phpgw_return_as: "json"
+ },
+ success: function( data ) {
+ response( $.map( data, function( item )
{
+ return {
+ label: item.name,
+ value:
item.location_code
+ }
+ }));
+ }
+ });
+ },
+ focus: function (event, ui) {
+ $(event.target).val(ui.item.label);
+ return false;
+ },
+ minLength: 1,
+ select: function( event, ui ) {
+ chooseLocation( ui.item.label, ui.item.value);
+ }
+ });
+});
+
+function chooseLocation( label, value ){
+ var currentYear = $("#currentYear").val();
+
+ var oArgs = {menuaction:'controller.uicalendar.view_calendar_for_year'};
+ var baseUrl = phpGWLink('index.php', oArgs, false);
+ var requestUrl = baseUrl + "&location_code=" + value +
"&year=" + currentYear;
+
+ window.location.replace(requestUrl);
+}
+
+</xsl:text>
+
+</script>
+
+<div class="yui-navset yui-navset-top" id="control_calendar_tabview">
+ <xsl:call-template name="view_calendar_for_locations" />
+ <xsl:if test="multiple_locations">
+ <xsl:call-template name="calendar_location" />
+ </xsl:if>
+</div>
+</xsl:template>
+
+
+<xsl:template name="view_calendar_for_locations"
xmlns:php="http://php.net/xsl";>
+ <div class="content-wrp">
+ <div>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <xsl:call-template name="msgbox"/>
+ </xsl:when>
+ </xsl:choose>
+ <div class="body">
+
+ <style type="text/css">
+
+ </style>
+
+ <div id="choose-location">
+ <xsl:apply-templates
select="filter_form" />
+
+ <form action="{update_action}"
name="acl_form" id="acl_form" method="post">
+
<xsl:call-template name="datatable"/>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</xsl:template>
+
+<xsl:template match="filter_form" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="filter_list"/>
+</xsl:template>
+
+<xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
+ <h4>Velg lokasjoner som du vil se årsplan for</h4>
+ <fieldset id="comp-filters">
+ <div class="select-box">
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'location type')" /></label>
+ <select id="location_type" name="location_type">
+ <xsl:apply-templates
select="location_type_list/options"/>
+ </select>
+ </div>
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'location category')" /></label>
+ <select id="location_type_category"
name="location_type_category"></select>
+ </div>
+ </div>
+
+ <div class="select-box">
+ <div class="filter">
+ <label><xsl:value-of select="php:function('lang',
'district')" /></label>
+ <select id="district_id" name="district_id">
+ <xsl:apply-templates
select="district_list/options"/>
+ </select>
+ </div>
+ <div class="filter">
+ <label><xsl:value-of
select="php:function('lang', 'part of town')" /></label>
+ <select id="part_of_town_id"
name="part_of_town_id">
+ <xsl:apply-templates
select="part_of_town_list/options"/>
+ </select>
+ </div>
+ </div>
+ </fieldset>
+</xsl:template>
+
+<xsl:template name="datatable" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="label_show"><xsl:value-of select="php:function('lang',
'show')" /></xsl:variable>
+ <input type="submit" name="update_acl" id="frm_update_acl" class="btn"
value="{$label_show}"/>
+
+ <div id="receipt"></div>
+</xsl:template>
+
+<!-- options for use with select-->
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
+
+<xsl:template name="calendar_location" xmlns:php="http://php.net/xsl";>
+ <div id="main_content">
+ <div id="control_plan">
+ <div class="top">
+
+ <xsl:choose>
+ <xsl:when test="location_level = 1">
+ <h1>Kontrollplan for eiendom:
+ <xsl:value-of
select="current_location/loc1_name"/>
+ </h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1>Kontrollplan for bygg:
+ <xsl:value-of
select="current_location/loc2_name"/>
+ </h1>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <h3>Kalenderoversikt for
+ <span class="year">
+ <xsl:value-of
select="current_year"/>
+ </span>
+ </h3>
+
+ <!-- ===================== SEARCH FOR LOCATION
================= -->
+ <div id="search-location" class="select-box">
+ <div id="choose-loc">
+ <input id="loc_type"
type="hidden" name="loc_type" value="2" />
+ <input type="hidden"
id="currentYear">
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="current_year"/>
+ </xsl:attribute>
+ </input>
+ <label>Søk etter</label>
+ <span>
+ <a href="loc_type_2"
class="btn first active">Bygg</a>
+ <a href="loc_type_1"
class="btn">Eiendom</a>
+ </span>
+ </div>
+ <input type="text" value=""
id="search-location-name" />
+ </div>
+ </div>
+
+ <div class="middle">
+
+
+
+ <!-- ===================== COLOR ICON MAP
================= -->
+ <xsl:call-template name="icon_color_map" />
+
+ <!-- ===================== FILTERS
================= -->
+ <xsl:call-template name="calendar_filters" >
+ <xsl:with-param
name="view_period">year</xsl:with-param>
+ </xsl:call-template>
+
+ <!-- ===================== CALENDAR NAVIGATION
================= -->
+ <xsl:call-template name="nav_calendar_year">
+ <xsl:with-param
name="view">VIEW_CONTROLS_FOR_LOCATION</xsl:with-param>
+ </xsl:call-template>
+ </div>
+
+ <div id="cal_wrp">
+ <h2>Bygg/eiendom</h2>
+ <table id="calendar" class="year">
+ <tr class="heading">
+ <th class="title">
+ <span>Tittel</span>
+ </th>
+ <th class="assigned">
+ <span>Tildelt</span>
+ </th>
+ <th class="frequency">
+ <span>Frekvens</span>
+ </th>
+ <xsl:for-each
select="heading_array">
+ <th>
+ <xsl:variable
name="month_str">short_month <xsl:number/> capitalized</xsl:variable>
+ <xsl:value-of
select="php:function('lang', $month_str)" />
+ </th>
+ </xsl:for-each>
+ </tr>
+ <xsl:for-each
select="location_calendar_array">
+ <xsl:choose>
+ <xsl:when
test="controls_calendar_array/child::node()">
+ <xsl:for-each
select="controls_calendar_array">
+
<xsl:variable name="control_id">
+
<xsl:value-of select="control/id"/>
+
</xsl:variable>
+ <tr>
+
<xsl:choose>
+
<xsl:when test="(position() mod 2) != 1">
+
<xsl:attribute name="class">odd</xsl:attribute>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="class">even</xsl:attribute>
+
</xsl:otherwise>
+
</xsl:choose>
+
<td class="title">
+
<a class="show-control-details">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of
select="php:function('get_phpgw_session_url')" />
+
</xsl:attribute>
+
<xsl:variable name="control_info_params">
+
<!--<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details,
control_id</xsl:text>-->
+
<!--<xsl:value-of select="control/id"/>-->
+
<!--<xsl:text>&phpgw_return_as=stripped_html</xsl:text>-->
+
<!--<xsl:value-of select="$session_url"/>-->
+
</xsl:variable>
+
<xsl:value-of select="control/title"/>
+
</a>
+
</td>
+
<td class="assigned">
+
<span>
+
<xsl:value-of select="control/responsibility_name"/>
+
</span>
+
</td>
+
<td class="frequency">
+
<span>
+
<xsl:choose>
+
<xsl:when test="control/repeat_interval = 1 and
control/repeat_type < 3">
+
<span class="pre">Hver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval = 1 and
control/repeat_type = 3">
+
<span class="pre">Hvert</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval = 2">
+
<span class="pre">Annenhver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval > 2">
+
<span class="pre">Hver</span>
+
<span>
+
<xsl:value-of
select="control/repeat_interval"/>.
+
</span>
+
</xsl:when>
+
</xsl:choose>
+
+
<span class="val">
+
<xsl:value-of select="control/repeat_type_label"/>
+
</span>
+
</span>
+
</td>
+
<xsl:for-each select="calendar_array">
+
<td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code">
+
<xsl:value-of select="/location_code"/>
+
</xsl:with-param>
+
<xsl:with-param name="serie_id"><xsl:value-of
select="/serie_id" /></xsl:with-param>
+
<xsl:with-param name="session_url"><xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:with-param>
+
</xsl:call-template>
+
</td>
+
</xsl:for-each>
+ </tr>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <tr
class="cal_info_msg">
+ <td
colspan="3">
+
<xsl:value-of select="php:function('lang', 'error_msg_no_controls_in_period')"
/>
+ </td>
+ </tr>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </table>
+
+ <h2 class="components">Komponenter</h2>
+ <xsl:choose>
+ <xsl:when
test="components_calendar_array/child::node()">
+ <xsl:for-each
select="components_calendar_array">
+ <h3>
+ <xsl:value-of
select="component/xml_short_desc"/>
+ </h3>
+
+ <table id="calendar"
class="year">
+ <tr
class="heading">
+ <th
class="title">
+
<span>Tittel</span>
+ </th>
+ <th
class="assigned">
+
<span>Tildelt</span>
+ </th>
+ <th
class="frequency">
+
<span>Frekvens</span>
+ </th>
+
<xsl:for-each select="//heading_array">
+
<th>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&year=</xsl:text>
+
<xsl:value-of select="//current_year"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of
select="//current_location/location_code"/>
+
<xsl:text>&month=</xsl:text>
+
<xsl:number/>
+
<xsl:value-of select="$session_url"/>
+
</xsl:attribute>
+
+
<xsl:variable name="month_str">short_month <xsl:number/>
capitalized</xsl:variable>
+
<xsl:value-of select="php:function('lang', $month_str)" />
+
</a>
+
</th>
+
</xsl:for-each>
+ </tr>
+
+ <xsl:for-each
select="controls_calendar">
+
<xsl:variable name="control_id">
+
<xsl:value-of select="control/id"/>
+
</xsl:variable>
+
+ <tr>
+
<xsl:choose>
+
<xsl:when test="(position() mod 2) != 1">
+
<xsl:attribute name="class">odd</xsl:attribute>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="class">even</xsl:attribute>
+
</xsl:otherwise>
+
</xsl:choose>
+
<td class="title">
+
<a class="show-control-details">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
+
</xsl:attribute>
+
<xsl:value-of select="control/title"/>
+
</a>
+
</td>
+
<td class="assigned">
+
<span>
+
<xsl:value-of select="control/responsibility_name"/>
+
</span>
+
</td>
+
<td class="frequency">
+
<span>
+
<xsl:choose>
+
<xsl:when test="control/repeat_interval = 1 and
control/repeat_type < 3">
+
<span class="pre">Hver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval = 1 and
control/repeat_type = 3">
+
<span class="pre">Hvert</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval = 2">
+
<span class="pre">Annenhver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval > 2">
+
<span class="pre">Hver</span>
+
<span>
+
<xsl:value-of
select="control/repeat_interval"/>.
+
</span>
+
</xsl:when>
+
</xsl:choose>
+
+
<span class="val">
+
<xsl:value-of select="control/repeat_type_label"/>
+
</span>
+
</span>
+
</td>
+
<xsl:for-each select="calendar_array">
+
<td>
+
<xsl:call-template name="check_list_status_manager" >
+
<xsl:with-param name="location_code">
+
<xsl:value-of
select="//current_location/location_code"/>
+
</xsl:with-param>
+
<xsl:with-param name="serie_id"><xsl:value-of
select="$serie_id"/></xsl:with-param>
+
<xsl:with-param name="session_url"><xsl:value-of
select="$session_url"/></xsl:with-param>
+
</xsl:call-template>
+
</td>
+
</xsl:for-each>
+ </tr>
+ </xsl:for-each>
+ </table>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div id="calendar">
+ <p
class="no-comp-msg">Ingen komponenter tilknyttet kontroll</p>
+ </div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </div>
+ </div>
+</xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/demo/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/demo/setup/phpgw_no.lang 2018-01-20 12:44:47 UTC
(rev 17655)
+++ branches/dev-syncromind/demo/setup/phpgw_no.lang 2018-01-20 12:51:21 UTC
(rev 17656)
@@ -2,13 +2,13 @@
demo common no Demo Modul
Add demo no Legg til
Delete demo no Slett
-Edit demo no Editer
+Edit demo no Rediger
View demo no Vis
apply demo no Mellomlagre
list demo no Liste
general demo no Generell
dates demo no Datoer
-custom attributes demo no Egendefinerte attributter
+custom attributes demo no Egendefinerte egenskaper
no category demo no Kategori ikke valgt
time created demo no Tidsstempel
inline tables demo no Tabeller
Modified: branches/dev-syncromind/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- branches/dev-syncromind/eventplanner/inc/class.bobooking.inc.php
2018-01-20 12:44:47 UTC (rev 17655)
+++ branches/dev-syncromind/eventplanner/inc/class.bobooking.inc.php
2018-01-20 12:51:21 UTC (rev 17656)
@@ -282,7 +282,7 @@
{
$rcpt = $send->msg('email', $to_email,
$subject, stripslashes($content), '', $cc, $bcc, $from_email, $from_name,
'html');
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
phpgwapi_cache::message_set($e->getMessage(),
'error');
}
Modified: branches/dev-syncromind/eventplanner/inc/class.bocalendar.inc.php
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17656] Dev-syncromind: Merge 17483:17654 from trunk,
sigurdne <=