[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8731] Merge 8692:8730 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8731] Merge 8692:8730 from trunk |
|
Date: |
Mon, 30 Jan 2012 18:39:48 +0000 |
Revision: 8731
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8731
Author: sigurdne
Date: 2012-01-30 18:39:47 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Merge 8692:8730 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/booking/templates/base/account_code_set_form.xsl
branches/Version-1_0-branch/controller/inc/class.menu.inc.php
branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
branches/Version-1_0-branch/controller/inc/hook_home.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_measurements.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
branches/Version-1_0-branch/controller/templates/base/control_location/add_location_to_control.xsl
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/config.tpl
branches/Version-1_0-branch/property/templates/base/project.xsl
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barcode4j-2.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-anim.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-awt-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-bridge.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-css.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-gvt.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-parser.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-script.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svg-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svggen.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-xml.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bcel-5.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/castor-1.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-digester-1.7.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-logging-1.0.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/dom4j-1.6.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hibernate3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/iText-2.1.7.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-core-lgpl-1.7.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-mapper-lgpl-1.7.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jpa.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mysql-connector-java-5.1.18-bin.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-schemas-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/postgresql-9.1-901.jdbc4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/rhino-1.7R1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/serializer.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/servlet.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/velocity-1.7-dep.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xbean.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xercesImpl-2.7.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis.jar
Removed Paths:
-------------
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
branches/Version-1_0-branch/controller/templates/base/tab_view_check_lists_garbage.xsl
branches/Version-1_0-branch/controller/templates/base/view_check_lists_for_location_garbage.xsl
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barcode4j-2.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-anim.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-awt-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-bridge.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-css.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-gvt.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-parser.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-script.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svg-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svggen.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-xml.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bcel-5.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-digester-1.7.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-logging-1.0.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hibernate3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/iText-2.1.7.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.0.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jpa.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mysql-connector-java-5.1.10-bin.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.6.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/postgresql-8.4-701.jdbc4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/rhino-1.7R1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/serializer.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/servlet.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xercesImpl-2.7.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis.jar
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -115,6 +115,10 @@
$filter_clauses[] = "org.id = {$id}";
}
}
+ if(isset($filters['edit_from_frontend']))
+ {
+ $filter_clauses[] = "org.id IN (SELECT organization_id
from activity_activity where state = 3 OR state = 4)";
+ }
/*
// All parties with contracts of type X
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -412,15 +412,22 @@
}
}
- private function send_email_to_selection($activities)
+ function send_email_to_selection($activities)
{
foreach($activities as $activity)
{
//$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
$subject = lang('mail_subject_update');
- $link_text =
"http://www.bergen.kommune.no/aktivby/registreringsskjema/endre/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ $link_text = "<a
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/endre/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
$office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
- $body = lang('mail_body_update', $activity->get_id() . ', ' .
$activity->get_title(), $link_text, $office_name);
+ if($activity->get_state() == 2)
+ {
+ $body = lang('mail_body_update_frontend',
$activity->get_id() . ', ' . $activity->get_title(), $link_text, $office_name);
+ }
+ else
+ {
+ $body = lang('mail_body_update', $activity->get_id() .
', ' . $activity->get_title(), $link_text, $office_name);
+ }
//var_dump($subject);
//var_dump($body);
@@ -428,14 +435,10 @@
if($activity->get_group_id() && $activity->get_group_id() > 0)
{
- //var_dump("group!");
- //$contact_person2 =
activitycalendar_socontactperson::get_instance()->get_group_contact2($activity>get_group_id());
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
$subject, $body);
}
else if($activity->get_organization_id() &&
$activity->get_organization_id() > 0)
{
- //var_dump("org!");
- //$contact_person2 =
activitycalendar_socontactperson::get_instance()->get_oup_contact2($activity>get_group_id());
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
$subject, $body);
}
}
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-01-30 18:39:47 UTC (rev 8731)
@@ -379,6 +379,7 @@
activity_helptext activitycalendar no Aktivitetsoversikten
henter kontaktinformasjon og beskrivelse fra bookingmodulen.<br/>Før ny
aktivitet kan registreres må du sjekke at organisasjon/gruppe finnes og er
oppdatert,<br/>og at arena finnes og er oppdatert. Feltet vis i portal skal
være satt til JA, i organisasjonsregisteret og evt. lag/gruppe. For nye
aktiviteter vil dette bli satt automatisk.
mail_subject_update activitycalendar no Melding fra AktivBy -
aktivitetsoversikt
mail_body_update activitycalendar no Dette er en melding fra
Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger i kommuneportalen
på internett, står du registrert som kontaktperson for %1.<br/>Ber om at du
kontrollerer at data er korrekt, og eventuelt endrer.<br/>%2<br/><br/><br/> Mvh
%3 kulturkontor
+mail_body_update_frontend activitycalendar no Dette er en
melding fra Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger i
kommuneportalen på internett, står du registrert som kontaktperson for
%1.<br/>Det har kommet inn et endringsønske på denne aktiviteten. Bruk lenken
under for å endre opplysningene om aktiviteten.<br/>%2<br/><br/><br/> Mvh %3
kulturkontor
mail_body_state_3 activitycalendar no Informasjon om din
aktivitet er registrert og vil bli publisert i kommuneportalen i løpet av
dagen.<br/>De som er registrert som kontaktpersoner får endre informasjonen,
dette gjøres via nettsiden:
https://www.bergen.kommune.no/tjenestetilbud/aktivitetsoversikt/<br/><br/><br/>
Mvh %1 kulturkontor
mail_body_state_4 activitycalendar no Ditt tips er behandlet
og publisert i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -435,6 +435,7 @@
$activity->set_state(2);
if($this->so_activity->store($activity))
{
+
$this->send_email_to_selection(array($activity));
$message = lang('update_request_sent',
$activity->get_title(), $org->get_name());
return
$this->render('activity_edit_step_1.php', array
(
@@ -451,7 +452,7 @@
{
//select activity to edit
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
- $organizations =
$this->so_organization->get(null, null, 'org.name', true, null, null, null);
+ $organizations =
$this->so_organization->get(null, null, 'org.name', true, null, null,
array('edit_from_frontend' => 'yes'));
return
$this->render('activity_edit_step_1.php', array
(
'activities' =>
$activities,
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-01-30 18:39:47 UTC (rev 8731)
@@ -63,7 +63,7 @@
target_not_selected activitycalendarfrontend no Målgruppe må
velges!
district_not_selected activitycalendarfrontend no Distrikt må
velges!
org_helptext activitycalendarfrontend no Velg organisasjon
aktiviteten skal knyttes til i nedtrekksmenyen, du kan søke ved å skrive inn
navnet.<br/>Dersom din organisasjon ikke finnes, velg "Ny organisasjon" og fyll
ut feltene som vises under.
-group_helptext activitycalendarfrontend no Dersom aktiviteten skal
registreres med andre kontaktpersoner og beskrivelse, kan du gjøre det ved å
velge «Ny gruppe» og fylle ut feltene under.<br/>Du kan også velge en
eksisterende gruppe/lag fra listen, eller ikke velge en gruppe/lag.<br/>Ønsker
du å redigere/endre eksisterende informasjonen om organisasjon eller
beskrivelse,<br/>vil du etter at du har valgt Lagre-knappen få opp et nytt
bilde hvor du du kan velge Rediger.
+group_helptext activitycalendarfrontend no Dersom aktiviteten skal
registreres med andre kontaktpersoner og beskrivelse, kan du gjøre det ved å
velge «Ny gruppe» og fylle ut feltene under.<br/>Du kan også velge en
eksisterende gruppe/lag fra listen, eller ikke velge en gruppe/lag.<br/>Ønsker
du å redigere/endre eksisterende informasjonen om organisasjon eller
beskrivelse,<br/>vil du etter at du har valgt Send-knappen få opp et nytt bilde
hvor du du kan velge Rediger.
criteria_label activitycalendarfrontend no Valgkriterier/søkeord i
portalen
criteria_helptext activitycalendarfrontend no Feltene må
fylles ut for at aktiviteten skal komme frem i søk i portalen, koder for
kategori og målgruppe hentes fra booking.
what activitycalendarfrontend no HVA
@@ -91,4 +91,6 @@
activity_edit_helptext activitycalendarfrontend no Velg
aktiviteten du ønsker å endre fra listen under.
send_change_request activitycalendarfrontend no Send inn
endringsønske
edit_organization activitycalendarfrontend no Rediger
organisasjonsinformasjon
-address activitycalendarfrontend no Adresse
\ No newline at end of file
+address activitycalendarfrontend no Adresse
+activity_edit_helptext_step1 activitycalendarfrontend no Skal du
endre opplysninger knyttet til en aktivitet må du være registrert som
kontaktperson for organisasjonen.<br/>Du velger organisasjon og aktivitet i
bildet under, og får en e-post i retur med en lenke til endringsskjema.
+mail_body_update_frontend activitycalendarfrontend no Dette
er en melding fra Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger
i kommuneportalen på internett, står du registrert som kontaktperson for
%1.<br/>Det har kommet inn et endringsønske på denne aktiviteten. Bruk lenken
under for å endre opplysningene om aktiviteten.<br/>%2<br/><br/><br/> Mvh %3
kulturkontor
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -44,6 +44,7 @@
<form action="#" method="post">
<dl class="proplist-col" style="width: 200%">
<dt>
+ <?php echo
lang('activity_edit_helptext_step1')?><br/><br/>
<?php echo
lang('activity_org_helptext_step1')?><br/><br/>
</dt>
<dd>
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -224,7 +224,7 @@
}
}
- $reservations =
$this->completed_reservation_so->read(array('filters' => $filters, 'results' =>
'all', 'order' => 'to_', 'dir' => 'asc'));
+ $reservations =
$this->completed_reservation_so->read(array('filters' => $filters, 'results' =>
'all', 'order' =>
'customer_type,customer_organization_number,customer_ssn,to_', 'dir' => 'asc'));
if (count($reservations['results']) > 0) {
return $reservations['results'];
@@ -597,7 +597,7 @@
//$orders = array();
$export_info = array();
$output = array();
-
+
/* NOTE: The specification states that values of type
date
* should be left padded with spaces. The example file,
* however, is right padded with spaces.
@@ -637,149 +637,242 @@
$status = str_pad(substr(strtoupper('N'), 0, 1), 1, '
');
$trans_type = str_pad(substr(strtoupper('42'), 0, 2),
2, ' ');
$voucher_type = str_pad(substr(strtoupper('FK'), 0, 2),
2, ' ');
-
+
+ $stored_header = array();
+ $line_no = 0;
foreach($reservations as &$reservation) {
if ($this->get_cost_value($reservation['cost'])
<= 0) {
continue; //Don't export costless rows
}
$type = $reservation['customer_type'];
- $order_id =
$sequential_number_generator->increment()->get_current();
- $export_info[] =
$this->create_export_item_info($reservation, $order_id);
+
+ if (($stored_header == array()) ||
($stored_header['tekst2'] !=
$this->get_customer_identifier_value_for($reservation)))
+ {
+ $order_id =
$sequential_number_generator->increment()->get_current();
+ $export_info[] =
$this->create_export_item_info($reservation, $order_id);
+
+ //header level
+ $header =
$this->get_agresso_row_template();
+ $header['accept_flag'] = '1';
- // $reservation = array_map('utf8_decode',
$reservation);
+ // TODO: Introduce a unique id if
several transfers in one day?
+ $header['batch_id'] =
+ $stored_header['batch_id'] = $batch_id;
+
+ $header['client'] = $client_id;
+ $stored_header['client'] = $client_id;
+ $header['confirm_date'] = $date;
+ $header['currency'] = $currency;
+ $header['deliv_date'] =
$header['confirm_date'];
+
+ //Skal leverer oppdragsgiver, blir et
nr. pr. fagavdeling. XXXX, et pr. fagavdeling
+ if
(isset($config->config_data['dim_value_1']))
+ {
+ $header['dim_value_1'] =
str_pad(strtoupper(substr($account_codes['unit_number'], 0, 12)), 12, ' ');
+ }
+
+ if
(isset($config->config_data['dim_value_4']))
+ {
+ $header['dim_value_4'] =
str_pad(substr($account_codes['dim_value_4'], 0, 12), 12, ' ');
+ }
+
+ if
(isset($config->config_data['dim_value_5']))
+ {
+ $header['dim_value_5'] =
str_pad(substr($account_codes['dim_value_5'], 0, 12), 12, ' ');
+ }
+
+ //Nøkkelfelt, kundens personnr/orgnr.
+ if ($type == 'internal') {
+ $header['tekst2'] =
str_pad(substr($config->config_data['organization_value'], 0, 12), 12, ' ');
+ $stored_header['tekst2'] =
$config->config_data['organization_value'];
+ $header['ext_ord_ref'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 15),
15, ' ');
+ } else {
+ $header['tekst2'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 12),
12, ' ');
+ $stored_header['tekst2'] =
$this->get_customer_identifier_value_for($reservation);
+ }
- //header level
- $header = $this->get_agresso_row_template();
- $header['accept_flag'] = '1';
+ $header['line_no'] = '0000'; //Nothing
here according to example file but spec. says so
- // TODO: Introduce a unique id if several
transfers in one day?
- $header['batch_id'] = $batch_id;
+ //Topptekst til faktura, knyttet mot
fagavdeling
+ $header['long_info1'] =
str_pad(substr(iconv("utf-8","ISO-8859-1",$account_codes['invoice_instruction']),
0, 120), 120, ' ');
+
+ //Ordrenr. UNIKT, løpenr. genereres i
booking ut fra gitt serie, eks. 38000000
+ $header['order_id'] =
str_pad($order_id, 9, 0, STR_PAD_LEFT);
+ $stored_header['order_id'] =
str_pad($order_id, 9, 0, STR_PAD_LEFT);
- $header['client'] = $client_id;
- $header['confirm_date'] = $date;
- $header['currency'] = $currency;
- $header['deliv_date'] = $header['confirm_date'];
+ $header['order_type'] = $order_type;
+ $header['pay_method'] = $pay_method;
+ $header['period'] = $period;
+ $stored_header['period'] = $period;
+ $header['responsible'] = $responsible;
+ $header['responsible2'] = $responsible2;
+ //$header['sequence_no'] =
str_repeat('0', 8); //Shouldn't be here although some examples provide it here
+ $header['status'] = $status;
+ $stored_header['status'] = $status;
+ $header['trans_type'] = $trans_type;
+ $stored_header['trans_type'] =
$trans_type;
+ $header['voucher_type'] = $voucher_type;
+ $stored_header['voucher_type'] =
$voucher_type;
+
+ //item level
+ $item =
$this->get_agresso_row_template();
+ $line_no = 1;
+ $item['accept_flag'] = '0';
- //Skal leverer oppdragsgiver, blir et nr. pr.
fagavdeling. XXXX, et pr. fagavdeling
- if (isset($config->config_data['dim_value_1']))
- {
- $header['dim_value_1'] =
str_pad(strtoupper(substr($account_codes['unit_number'], 0, 12)), 12, ' ');
- }
+ $item['amount'] =
$this->format_cost($reservation['cost']); //Feltet viser netto totalbeløp i
firmavaluta for hver ordrelinje. Brukes hvis amount_set er 1. Hvis ikke, brukes
prisregisteret (*100 angis). Dersom beløpet i den aktuelle valutaen er angitt i
filen, vil beløpet beregnes på grunnlag av beløpet i den aktuelle valutaen ved
hjelp av firmaets valutakurs-oversikt.
+ $item['amount_set'] = '1';
- if (isset($config->config_data['dim_value_4']))
- {
- $header['dim_value_4'] =
str_pad(substr($account_codes['dim_value_4'], 0, 12), 12, ' ');
- }
+ /* Data hentes fra booking, tidspunkt
legges i eget felt som kommer på
+ * linjen under: 78_short_info. <navn
på bygg>, <navn på ressurs>
+ */
+ $item['art_descr'] =
str_pad(substr(iconv("utf-8","ISO-8859-1",$reservation['article_description']),
0, 35), 35, ' '); //35 chars long
- if (isset($config->config_data['dim_value_5']))
- {
- $header['dim_value_5'] =
str_pad(substr($account_codes['dim_value_5'], 0, 12), 12, ' ');
- }
+ //Artikkel opprettes i Agresso (4
siffer), en for kultur og en for idrett, inneholder konteringsinfo.
+ $item['article'] =
str_pad(substr(strtoupper($account_codes['article']), 0, 15), 15, ' ');
- //Nøkkelfelt, kundens personnr/orgnr.
- if ($type == 'internal') {
- $header['tekst2'] =
str_pad(substr($config->config_data['organization_value'], 0, 12), 12, ' ');
- $header['ext_ord_ref'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 15),
15, ' ');
- } else {
- $header['tekst2'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 12),
12, ' ');
- }
- $header['line_no'] = '0000'; //Nothing here
according to example file but spec. says so
+ $item['batch_id'] = $header['batch_id'];
+ $item['client'] = $header['client'];
+
+ //Ansvarssted for inntektsføring for
varelinjen avleveres i feltet (ANSVAR - f.eks 724300). ansvarsted (6 siffer)
knyttet mot bygg /sesong
+ if
(isset($config->config_data['dim_1']))
+ {
+ $item['dim_1'] =
str_pad(strtoupper(substr($account_codes['responsible_code'], 0, 8)), 8, ' ');
+ }
- //Topptekst til faktura, knyttet mot fagavdeling
- $header['long_info1'] =
str_pad(substr(iconv("utf-8","windows-1252",$account_codes['invoice_instruction']),
0, 120), 120, ' ');
+ //Tjeneste, eks. 38010 drift av
idrettsbygg. Kan ligge på artikkel i Agresso. Blank eller tjenestenr.
(eks.38010) vi ikke legger det i artikkel
+ if
(isset($config->config_data['dim_2']))
+ {
+ $item['dim_2'] =
str_pad(strtoupper(substr($account_codes['service'], 0, 8)), 8, ' ');
+ }
+
+ //Objektnr. vil være knyttet til hvert
hus (FDVU)
+ if
(isset($config->config_data['dim_3']))
+ {
+ $item['dim_3'] =
str_pad(strtoupper(substr($account_codes['object_number'], 0, 8)), 8, ' ');
+ }
+
+ if
(isset($config->config_data['dim_4']))
+ {
+ $item['dim_4'] =
str_pad(substr($account_codes['dim_4'], 0, 8), 8, ' ');
+ }
+
+ //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, ' ');
+ }
+
+ $item['line_no'] = str_pad($line_no, 4,
0, STR_PAD_LEFT);
+
+ $item['order_id'] = $header['order_id'];
+ $item['period'] = $header['period'];
+ $item['sequence_no'] = str_repeat('0',
8);
- //Ordrenr. UNIKT, løpenr. genereres i booking
ut fra gitt serie, eks. 38000000
- $header['order_id'] = str_pad($order_id, 9, 0,
STR_PAD_LEFT);
+ $item['status'] = $header['status'];
+ $item['trans_type'] =
$header['trans_type'];
- $header['order_type'] = $order_type;
- $header['pay_method'] = $pay_method;
- $header['period'] = $period;
- $header['responsible'] = $responsible;
- $header['responsible2'] = $responsible2;
- //$header['sequence_no'] = str_repeat('0', 8);
//Shouldn't be here although some examples provide it here
- $header['status'] = $status;
- $header['trans_type'] = $trans_type;
- $header['voucher_type'] = $voucher_type;
+ $item['value_1'] = str_pad(1*100, 17,
0, STR_PAD_LEFT); //Units. Multiplied by 100.
+ $item['voucher_type'] =
$header['voucher_type'];
- //item level
- $item = $this->get_agresso_row_template();
- $line_no = 1;
- $item['accept_flag'] = '0';
+ //text level
+ $text =
$this->get_agresso_row_template();
+ $text['accept_flag'] = '0';
+ $text['order_id'] = $header['order_id'];
+ $text['batch_id'] = $header['batch_id'];
+ $text['client'] = $header['client'];
+ $text['line_no'] = $item['line_no'];
+ $text['short_info'] =
str_pad(substr(iconv("utf-8","ISO-8859-1",$reservation['description']), 0, 60),
60, ' ');
+ $text['trans_type'] =
$header['trans_type'];
+ $text['voucher_type'] =
$header['voucher_type'];
- $item['amount'] =
$this->format_cost($reservation['cost']); //Feltet viser netto totalbeløp i
firmavaluta for hver ordrelinje. Brukes hvis amount_set er 1. Hvis ikke, brukes
prisregisteret (*100 angis). Dersom beløpet i den aktuelle valutaen er angitt i
filen, vil beløpet beregnes på grunnlag av beløpet i den aktuelle valutaen ved
hjelp av firmaets valutakurs-oversikt.
- $item['amount_set'] = '1';
+ $text['sequence_no'] =
str_pad(intval($item['sequence_no'])+1, 8, '0', STR_PAD_LEFT);
- /* Data hentes fra booking, tidspunkt legges i
eget felt som kommer på
- * linjen under: 78_short_info. <navn på bygg>,
<navn på ressurs>
- */
- $item['art_descr'] =
str_pad(substr(iconv("utf-8","windows-1252",$reservation['article_description']),
0, 35), 35, ' '); //35 chars long
+ //Add to orders
+ //$orders[] = array('header' =>
$header, 'items' => array('item' => $item, 'text' => $text));
+ $output[] = implode('',
str_replace(array("\n", "\r"), '', $header));
+ $output[] = implode('',
str_replace(array("\n", "\r"), '', $item));
+ $output[] = implode('',
str_replace(array("\n", "\r"), '', $text));
+
+ } else {
+
+ //item level
+ $item =
$this->get_agresso_row_template();
+ $line_no += 1;
+ $item['accept_flag'] = '0';
- //Artikkel opprettes i Agresso (4 siffer), en
for kultur og en for idrett, inneholder konteringsinfo.
- $item['article'] =
str_pad(substr(strtoupper($account_codes['article']), 0, 15), 15, ' ');
+ $item['amount'] =
$this->format_cost($reservation['cost']); //Feltet viser netto totalbeløp i
firmavaluta for hver ordrelinje. Brukes hvis amount_set er 1. Hvis ikke, brukes
prisregisteret (*100 angis). Dersom beløpet i den aktuelle valutaen er angitt i
filen, vil beløpet beregnes på grunnlag av beløpet i den aktuelle valutaen ved
hjelp av firmaets valutakurs-oversikt.
+ $item['amount_set'] = '1';
- $item['batch_id'] = $header['batch_id'];
- $item['client'] = $header['client'];
+ /* Data hentes fra booking, tidspunkt
legges i eget felt som kommer på
+ * linjen under: 78_short_info. <navn
på bygg>, <navn på ressurs>
+ */
+ $item['art_descr'] =
str_pad(substr(iconv("utf-8","ISO-8859-1",$reservation['article_description']),
0, 35), 35, ' '); //35 chars long
- //Ansvarssted for inntektsføring for varelinjen
avleveres i feltet (ANSVAR - f.eks 724300). ansvarsted (6 siffer) knyttet mot
bygg /sesong
- if (isset($config->config_data['dim_1']))
- {
- $item['dim_1'] =
str_pad(strtoupper(substr($account_codes['responsible_code'], 0, 8)), 8, ' ');
- }
+ //Artikkel opprettes i Agresso (4
siffer), en for kultur og en for idrett, inneholder konteringsinfo.
+ $item['article'] =
str_pad(substr(strtoupper($account_codes['article']), 0, 15), 15, ' ');
- //Tjeneste, eks. 38010 drift av idrettsbygg.
Kan ligge på artikkel i Agresso. Blank eller tjenestenr. (eks.38010) vi ikke
legger det i artikkel
- if (isset($config->config_data['dim_2']))
- {
- $item['dim_2'] =
str_pad(strtoupper(substr($account_codes['service'], 0, 8)), 8, ' ');
- }
+ $item['batch_id'] =
$stored_header['batch_id'];
+ $item['client'] =
$stored_header['client'];
+
+ //Ansvarssted for inntektsføring for
varelinjen avleveres i feltet (ANSVAR - f.eks 724300). ansvarsted (6 siffer)
knyttet mot bygg /sesong
+ if
(isset($config->config_data['dim_1']))
+ {
+ $item['dim_1'] =
str_pad(strtoupper(substr($account_codes['responsible_code'], 0, 8)), 8, ' ');
+ }
- //Objektnr. vil være knyttet til hvert hus
(FDVU)
- if (isset($config->config_data['dim_3']))
- {
- $item['dim_3'] =
str_pad(strtoupper(substr($account_codes['object_number'], 0, 8)), 8, ' ');
- }
+ //Tjeneste, eks. 38010 drift av
idrettsbygg. Kan ligge på artikkel i Agresso. Blank eller tjenestenr.
(eks.38010) vi ikke legger det i artikkel
+ if
(isset($config->config_data['dim_2']))
+ {
+ $item['dim_2'] =
str_pad(strtoupper(substr($account_codes['service'], 0, 8)), 8, ' ');
+ }
- if (isset($config->config_data['dim_4']))
- {
- $item['dim_4'] =
str_pad(substr($account_codes['dim_4'], 0, 8), 8, ' ');
- }
+ //Objektnr. vil være knyttet til hvert
hus (FDVU)
+ if
(isset($config->config_data['dim_3']))
+ {
+ $item['dim_3'] =
str_pad(strtoupper(substr($account_codes['object_number'], 0, 8)), 8, ' ');
+ }
- //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, ' ');
- }
+ if
(isset($config->config_data['dim_4']))
+ {
+ $item['dim_4'] =
str_pad(substr($account_codes['dim_4'], 0, 8), 8, ' ');
+ }
- $item['line_no'] = str_pad($line_no, 4, 0,
STR_PAD_LEFT);
+ //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, ' ');
+ }
- $item['order_id'] = $header['order_id'];
- $item['period'] = $header['period'];
- $item['sequence_no'] = str_repeat('0', 8);
+ $item['line_no'] = str_pad($line_no, 4,
0, STR_PAD_LEFT);
+
+ $item['order_id'] =
$stored_header['order_id'];
+ $item['period'] =
$stored_header['period'];
+ $item['sequence_no'] = str_repeat('0',
8);
- $item['status'] = $header['status'];
- $item['trans_type'] = $header['trans_type'];
+ $item['status'] =
$stored_header['status'];
+ $item['trans_type'] =
$stored_header['trans_type'];
- $item['value_1'] = str_pad(1*100, 17, 0,
STR_PAD_LEFT); //Units. Multiplied by 100.
- $item['voucher_type'] = $header['voucher_type'];
+ $item['value_1'] = str_pad(1*100, 17,
0, STR_PAD_LEFT); //Units. Multiplied by 100.
+ $item['voucher_type'] =
$stored_header['voucher_type'];
- //text level
- $text = $this->get_agresso_row_template();
- $text['accept_flag'] = '0';
- $text['order_id'] = $header['order_id'];
- $text['batch_id'] = $header['batch_id'];
- $text['client'] = $header['client'];
- $text['line_no'] = $item['line_no'];
- $text['short_info'] =
str_pad(substr(iconv("utf-8","windows-1252",$reservation['description']), 0,
60), 60, ' ');
- $text['trans_type'] = $header['trans_type'];
- $text['voucher_type'] = $header['voucher_type'];
+ //text level
+ $text =
$this->get_agresso_row_template();
+ $text['accept_flag'] = '0';
+ $text['order_id'] =
$stored_header['order_id'];
+ $text['batch_id'] =
$stored_header['batch_id'];
+ $text['client'] =
$stored_header['client'];
+ $text['line_no'] = $item['line_no'];
+ $text['short_info'] =
str_pad(substr(iconv("utf-8","ISO-8859-1",$reservation['description']), 0, 60),
60, ' ');
+ $text['trans_type'] =
$stored_header['trans_type'];
+ $text['voucher_type'] =
$stored_header['voucher_type'];
- $text['sequence_no'] =
str_pad(intval($item['sequence_no'])+1, 8, '0', STR_PAD_LEFT);
+ $text['sequence_no'] =
str_pad(intval($item['sequence_no'])+1, 8, '0', STR_PAD_LEFT);
- //Add to orders
- //$orders[] = array('header' => $header,
'items' => array('item' => $item, 'text' => $text));
- $output[] = implode('', str_replace(array("\n",
"\r"), '', $header));
- $output[] = implode('', str_replace(array("\n",
"\r"), '', $item));
- $output[] = implode('', str_replace(array("\n",
"\r"), '', $text));
-
+ //Add to orders
+ //$orders[] = array('header' =>
$header, 'items' => array('item' => $item, 'text' => $text));
+ $output[] = implode('',
str_replace(array("\n", "\r"), '', $item));
+ $output[] = implode('',
str_replace(array("\n", "\r"), '', $text));
+ }
}
if (count($export_info) == 0) {
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -173,13 +173,13 @@
}
//double-check that the total_items
match the total number of completed reservations associated with the exported
file
- if ($associated_reservation_count !==
$entity_export_file['total_items']) {
- throw new
UnexpectedValueException(sprintf(
- "Exported item count
(%s) does not match count (%s) of associated completed reservations",
-
$entity_export_file['total_items'],
-
$associated_reservation_count
- ));
- }
+# if ($associated_reservation_count !==
$entity_export_file['total_items']) {
+# throw new
UnexpectedValueException(sprintf(
+# "Exported item count
(%s) does not match count (%s) of associated completed reservations",
+#
$entity_export_file['total_items'],
+#
$associated_reservation_count
+# ));
+# }
}
$this->db_query(
Modified:
branches/Version-1_0-branch/booking/templates/base/account_code_set_form.xsl
===================================================================
---
branches/Version-1_0-branch/booking/templates/base/account_code_set_form.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/booking/templates/base/account_code_set_form.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -110,9 +110,7 @@
<div class="clr"/>
<dl class="form">
<dt><label
for="field_invoice_instruction"><xsl:value-of select="php:function('lang',
'Invoice instruction')" /></label></dt>
- <dd>
- <textarea
id="field_invoice_instruction" class="full-width"
name="invoice_instruction"><xsl:value-of
select="account_code_set/invoice_instruction"/></textarea>
- </dd>
+ <dd><input size="120"
id="field_invoice_instruction" name="invoice_instruction"
value="{account_code_set/invoice_instruction}" /></dd>
</dl>
<div class="clr"/>
Modified: branches/Version-1_0-branch/controller/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -99,7 +99,7 @@
'check_list' => array
(
'text' => lang('Check_list'),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicheck_list_for_location.index') ),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicheck_list.index') ),
'image' => array('property',
'location_1'),
),
'calendar_overview' => array
@@ -117,7 +117,7 @@
'check_list' => array
(
'text' => lang('Check_list'),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicheck_list_for_location.index') ),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicheck_list.index') ),
'image' => array('property',
'location_1'),
),
'location_check_list' => array
Modified: branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -302,6 +302,8 @@
$sql .= "AND cic.status = 0 ";
else if($status == 'closed')
$sql .= "AND cic.status = 1 ";
+ else if($status == 'open_or_waiting')
+ $sql .= "AND cic.status = 0 OR cic.status = 2";
if($messageStatus != null & $messageStatus ==
'no_message_registered')
$sql .= "AND cic.location_item_id IS NULL ";
Modified: branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -207,12 +207,13 @@
function get_check_lists_for_control($control_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
- $sql .= "completed_date, component_id, location_code,
num_open_cases ";
+ $sql .= "completed_date, component_id, location_code,
num_open_cases, ";
$sql .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id ";
$sql .= "FROM controller_check_list cl, controller_check_item
ci ";
$sql .= "WHERE cl.control_id = $control_id ";
$sql .= "AND cl.id = ci.check_list_id ";
$sql .= "ORDER BY cl.id;";
+ //var_dump($sql);
$this->db->query($sql);
$check_list_id = 0;
@@ -260,6 +261,46 @@
}
}
+ function get_planned_check_lists_for_control($control_id){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
+ $sql .= "completed_date, component_id, location_code,
num_open_cases ";
+ $sql .= "FROM controller_check_list cl ";
+ $sql .= "WHERE cl.control_id = $control_id ";
+ $sql .= "ORDER BY cl.id;";
+
+ $this->db->query($sql);
+
+ $check_list_id = 0;
+ $check_list = null;
+ while ($this->db->next_record()) {
+
+ if( $this->db->f('cl_id', true) != $check_list_id ){
+
+ if($check_list_id != 0){
+ $check_list_array[] = $check_list;
+ }
+
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
+
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+ }
+ $check_list_id = $check_list->get_id();
+ }
+
+ if($check_list != null){
+ $check_list_array[] = $check_list;
+
+ return $check_list_array;
+ }else {
+ return null;
+ }
+ }
+
function get_agg_check_lists_for_location( $location_code,
$from_date_ts, $to_date_ts ){
$sql = "SELECT c.id as c_id, title, start_date, end_date,
cl.id as cl_id, c.repeat_type, c.repeat_interval, cl.deadline, count(ci.id) ";
@@ -407,10 +448,15 @@
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on cl.control_id =
c.id ";
$sql .= "WHERE cl.location_code = $location_code ";
- $sql .= "AND c.repeat_type = $repeat_type ";
+
+ if( is_numeric($repeat_type) )
+ $sql .= "AND c.repeat_type = $repeat_type ";
+
$sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
$sql .= "ORDER BY c.id;";
+
+
$this->db->query($sql);
$control_id = 0;
@@ -453,6 +499,39 @@
return $controls_array;
}
+ function get_check_list_for_date($control_id, $current_date){
+ $sql = "SELECT c.id as c_id, title, description, start_date,
end_date, control_area_id, c.location_code as c_location_code, repeat_type,
repeat_interval, ";
+ $sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
+ $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases ";
+ $sql .= "FROM controller_control c ";
+ $sql .= "LEFT JOIN controller_check_list cl on cl.control_id =
c.id ";
+ $sql .= "WHERE c.id = {$control_id} ";
+ $sql .= "AND NOT planned_date IS NULL ";
+// $sql .= "AND planned_date = {$current_date}";
+
+// var_dump($sql);
+
+ $this->db->query($sql);
+ $check_lists_array = array();
+
+ while ($this->db->next_record()) {
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+ $check_list->set_control_id($control_id);
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
+
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
+
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
+
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
+ $check_lists_array[] = $check_list;
+ }
+// if()
+ return $check_lists_array;
+ }
+
function get_query(string $sort_field, boolean $ascending, string
$search_for, string $search_type, array $filters, boolean $return_count)
{
$current_time = time();
@@ -586,7 +665,7 @@
$values = array(
'control_id = ' .
$this->marshal($check_list->get_control_id(), 'int'),
'status = ' . $check_list->get_status(),
- 'comment = ' .
$this->marshal($check_list->get_comment(), 'string'),
+ 'comment = ' . $check_list->get_comment(),
'deadline = ' .
$this->marshal($check_list->get_deadline(), 'int'),
'planned_date = ' .
$this->marshal($check_list->get_planned_date(), 'int'),
'completed_date = ' .
$this->marshal($check_list->get_completed_date(), 'int'),
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -518,4 +518,16 @@
return preg_split('/,/', $result);
}
}
+
+ public function getLocationCodeFromControl($control_id)
+ {
+ $sql = "select location_code from
controller_control_location_list where control_id={$control_id}";
+ $this->db->query($sql,__LINE__,__FILE__);
+ if($this->db->num_rows() > 0)
+ {
+ $this->db->next_record();
+ $result = $this->db->f(location_code);
+ return $result;
+ }
+ }
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -92,8 +92,6 @@
$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
- $repeat_type = 0;
-
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
@@ -111,9 +109,9 @@
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year) ;
- $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
+ $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts);
- $control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
+ $control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts,
$to_date_ts);
$controls_with_check_list =
$this->populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array);
@@ -202,7 +200,7 @@
// Puts aggregate values for daily controls in a twelve
month array
foreach($controls_for_location_array as $control){
- if($control->get_repeat_type() == 0){
+ if($control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1){
$controls_calendar_array =
$this->calendar_builder->build_agg_calendar_array($controls_calendar_array,
$control, $location_code, $year);
}
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicheck_list_for_location.inc.php 8419 2011-12-23
09:54:15Z vator $
+ * @version $Id: class.uicheck_list.inc.php 8419 2011-12-23 09:54:15Z
vator $
*/
phpgw::import_class('phpgwapi.yui');
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -27,63 +27,68 @@
* @subpackage controller
* @version $Id$
*/
-
+
+ phpgw::import_class('phpgwapi.yui');
phpgw::import_class('controller.uicommon');
+ phpgw::import_class('controller.socontrol_area');
phpgw::import_class('controller.socheck_list');
-
+
include_class('controller', 'check_list', 'inc/model/');
- include_class('controller', 'check_item', 'inc/model/');
+ include_class('controller', 'date_generator', 'inc/component/');
include_class('controller', 'status_checker', 'inc/helper/');
include_class('controller', 'date_helper', 'inc/helper/');
-
- class controller_uicheck_list extends controller_uicommon
+ include_class('controller', 'check_item', 'inc/model/');
+
+ class controller_uicheck_list_for_location extends controller_uicommon
{
private $so;
+ private $so_control_area;
private $so_control;
- private $so_control_group;
- private $so_control_group_list;
private $so_control_item;
- private $so_check_list;
private $so_check_item;
private $so_procedure;
+ private $so_control_group_list;
+ private $so_control_item_list;
+
+ var $public_functions = array(
+
'index' => true,
+
'add_check_list' => true,
+
'save_check_list' => true,
+
'edit_check_list' => true,
+
'create_case_message' => true,
+
'view_control_info' => true,
+
'view_cases_for_check_list' => true,
+
'update_check_list' => true,
+
'print_check_list' => true,
+
'register_case' => true,
+
'view_open_cases' => true,
+
'view_closed_cases' => true,
+
'view_measurements' => true,
+
'view_control_details' => true,
+
'view_control_items' => true,
+
'add_check_item_to_list' => true,
+
'save_check_items' => true,
+
'save_check_item' => true,
+
'get_check_list_info' => true,
+
'get_cases_for_check_list' => true
+ );
- public $public_functions = array
- (
- 'index' => true,
- // 'view_check_lists_for_control' => true,
- // 'save_check_list'
=> true,
- // 'view_check_list'
=> true,
- // 'edit_check_list'
=> true,
- // 'save_check_items'
=> true,
- // 'save_check_item'
=> true,
- // 'get_check_list_info' =>
true,
- // 'control_calendar_status_overview' => true,
- // 'add_check_item_to_list' =>
true,
- // 'view_control_items' =>
true,
- //'view_control_details'
=> true,
- //'register_case'
=> true,
- //'view_open_cases'
=> true,
- //'view_closed_cases'
=> true,
- //'view_measurements'
=> true,
- // 'get_cases_for_check_list' =>
true
- );
-
- public function __construct()
+ function __construct()
{
parent::__construct();
- $this->so = CreateObject('controller.socheck_list');
- $this->so_control =
CreateObject('controller.socontrol');
- $this->so_control_group =
CreateObject('controller.socontrol_group');
+ $this->so_control_area =
CreateObject('controller.socontrol_area');
+ $this->so_control =
CreateObject('controller.socontrol');
+ $this->so =
CreateObject('controller.socheck_list');
+ $this->so_control_item =
CreateObject('controller.socontrol_item');
+ $this->so_check_item =
CreateObject('controller.socheck_item');
+ $this->so_procedure =
CreateObject('controller.soprocedure');
$this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
- $this->so_control_item =
CreateObject('controller.socontrol_item');
- $this->so_check_list =
CreateObject('controller.socheck_list');
- $this->so_check_item =
CreateObject('controller.socheck_item');
- $this->so_procedure =
CreateObject('controller.soprocedure');
+ $this->so_control_item_list =
CreateObject('controller.socontrol_item_list');
- $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::check_list";
- }
-/*
+
self::set_active_menu('controller::control::check_list');
+ }
+
public function index()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
@@ -171,94 +176,264 @@
)
),
);
-//_debug_array($data);
self::render_template_xsl('datatable', $data);
}
- */
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function view_check_list()
- {
+
+ function add_check_list(){
+ $location_code = phpgw::get_var('location_code');
+ $control_id = phpgw::get_var('control_id');
+ $date = phpgw::get_var('date');
+
+ $control = $this->so_control->get_single($control_id);
+
+ if($date == null || $date == ''){
+ $todays_date = mktime(0,0,0, date("m"),
date("d"), date("Y"));
+ $period_start_date = $todays_date;
+
+ if( $control->get_repeat_type() == 1 )
+ {
+ $period_end_date = mktime(0,0,0,
date("m")+1, date("d"), date("Y"));
+ }else if( $control->get_repeat_type() == 2 )
+ {
+ $period_end_date = mktime(0,0,0,
date("m"), date("d"), date("Y") + 1);
+ }else if( $control->get_repeat_type() == 3 )
+ {
+ $period_end_date = mktime(0,0,0,
date("m"), date("d"), date("Y") + $control->get_repeat_interval());
+ }
+
+ $date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$period_start_date, $period_end_date, $control->get_repeat_type(),
$control->get_repeat_interval());
+
+ $calendar_array = $date_generator->get_dates();
+ }
+ else
+ {
+ $calendar_array[] = $date;
+ }
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
+ $data = array
+ (
+ 'location_array' => $location_array,
+ 'control_array' => $control->toArray(),
+ 'deadline' =>
$calendar_array[0],
+ 'date_format' => $date_format
+ );
+
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'custom_ui.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+
+
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/add_check_list'),
$data);
+ }
+
+ function edit_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single_with_control_items($check_list_id);
-
+
+ $check_list = $this->so->get_single($check_list_id);
+ $control =
$this->so_control->get_single($check_list->get_control_id());
+
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-
+ $location_code = $check_list->get_location_code();
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
$data = array
(
- 'check_list' => $check_list,
- 'date_format' => $date_format
+ 'control' =>
$control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'location_array' => $location_array,
+ 'date_format' => $date_format
);
-
- self::render_template_xsl('view_check_list', $data);
+
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ self::add_javascript('controller', 'controller',
'custom_ui.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+
+
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
}
-
-
- // Returns check list info as JSON
- public function get_check_list_info()
- {
+
+ function view_cases_for_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single_with_check_items($check_list_id, "open");
- return json_encode( $check_list );
+ $check_list = $this->so->get_single($check_list_id);
+ $control =
$this->so_control->get_single($check_list->get_control_id());
+
+ $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $location_code = $check_list->get_location_code();
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
+ $data = array
+ (
+ 'control' =>
$control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'location_array' => $location_array,
+ 'date_format' => $date_format
+ );
+
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ self::add_javascript('controller', 'controller',
'custom_ui.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+
+
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
- public function get_cases_for_check_list()
- {
- $check_list_id = phpgw::get_var('check_list_id');
+ function save_check_list(){
+ $location_code = phpgw::get_var('location_code');
+ $control_id = phpgw::get_var('control_id');
+ $status = (int)phpgw::get_var('status');
- $check_items_with_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, "open", null,
"return_array");
+ $deadline_date = phpgw::get_var('deadline_date',
'string');
+ $planned_date = phpgw::get_var('planned_date',
'string');
+ $completed_date = phpgw::get_var('completed_date',
'string');
- return json_encode( $check_items_with_cases );
+ $comment = phpgw::get_var('comment', 'string');
+
+ if($planned_date != '')
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
+
+ if($deadline_date != '')
+ $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date, "d/m-Y" );
+
+ if($completed_date != '')
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
+
+ $check_list = new controller_check_list();
+ $check_list->set_location_code($location_code);
+ $check_list->set_control_id($control_id);
+ $check_list->set_status($status);
+ $check_list->set_comment($comment);
+ $check_list->set_deadline( $deadline_date_ts );
+ $check_list->set_planned_date($planned_date_ts);
+ $check_list->set_completed_date($completed_date_ts);
+
+ $check_list_id = $this->so->store($check_list);
+
+ $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list',
'check_list_id'=>$check_list_id));
}
-
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function edit_check_list()
- {
+
+ function create_case_message(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single_with_control_items($check_list_id);
-
+
+ $check_list_with_check_items =
$this->so->get_single_with_check_items($check_list_id);
+
+ $control_id =
$check_list_with_check_items["control_id"];
+ $control = $this->so_control->get_single( $control_id );
+
+ $location_code =
$check_list_with_check_items["location_code"];
+
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
$data = array
(
- 'check_list' => $check_list,
- 'date_format' => $date_format
+ 'location_array' =>
$location_array,
+ 'control_array' =>
$control->toArray(),
+ 'check_list' =>
$check_list_with_check_items,
+ 'date_format' => $date_format
);
-
- self::render_template_xsl('edit_check_list', $data);
+
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ self::add_javascript('controller', 'controller',
'custom_ui.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+
+ self::render_template_xsl('create_case_messsage',
$data);
}
- */
-
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function control_calendar_status_overview()
- {
- $control_id = phpgw::get_var('control_id');
- $control = $this->so_control->get_single($control_id);
+
+ public function view_control_info(){
+ $check_list_id = phpgw::get_var('check_list_id');
+
+ $check_list = $this->so->get_single($check_list_id);
+ $control =
$this->so_control->get_single($check_list->get_control_id());
+
+ $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
+ $cats->supress_info = true;
+
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
+ array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
+ $control_areas_array2 = array();
+
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_areas_array2[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-
- $check_list_array =
$this->so->get_check_lists_for_control( $control_id );
-
+ // Fetches prosedures that are related to first control
area in list
+ $control_area_id = $control_areas_array2[1]['id'];
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
+ $role_array = $this->so_control->get_roles();
+
+ $location_code = $check_list->get_location_code();
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
$data = array
(
- 'control_as_array' => $control->toArray(),
- 'check_list_array' => $check_list_array,
- 'date_format' => $date_format
+ 'location_array' =>
$location_array,
+ 'control' =>
$control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'date_format' => $date_format,
+ 'control_areas_array2' => array('options' =>
$control_areas_array2),
+ 'procedures_array' =>
$procedures_array,
+ 'role_array' => $role_array
);
-
self::render_template_xsl('control_calendar_status_overview', $data);
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+
+
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
- */
- /*
- public function view_control_items(){
+ public function update_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single($check_list_id);
-
+ $status = (int)phpgw::get_var('status');
+ $comment = phpgw::get_var('comment');
+ $deadline_date = phpgw::get_var('deadline_date');
+ $completed_date = phpgw::get_var('completed_date');
+ $planned_date = phpgw::get_var('planned_date');
+
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
+
+ echo " comment: " . $comment;
+
+ // Fetches check_list from DB
+ $update_check_list =
$this->so->get_single($check_list_id);
+ $update_check_list->set_status( $status );
+ $update_check_list->set_comment( $comment );
+ $update_check_list->set_completed_date(
$completed_date_ts );
+ $update_check_list->set_planned_date( $planned_date_ts
);
+
+ $check_list_id = $this->so->update( $update_check_list
);
+
+ if($check_list_id > 0)
+ return json_encode( array( "saveStatus" =>
"updated" ) );
+ else
+ return json_encode( array( "saveStatus" =>
"not_updated" ) );
+ }
+
+ public function print_check_list(){
+ $check_list_id = phpgw::get_var('check_list_id');
+ $check_list = $this->so->get_single($check_list_id);
+
$control =
$this->so_control->get_single($check_list->get_control_id());
$control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
@@ -280,10 +455,10 @@
'check_list'
=> $check_list->toArray()
);
-
self::render_template_xsl('check_list/view_control_items', $data);
+
self::render_template_xsl('check_list/print_check_list', $data);
}
- public function view_control_details(){
+ function view_control_details(){
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
@@ -317,11 +492,11 @@
self::render_template_xsl('check_list/view_control_details', $data);
}
-
+
function register_case(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single($check_list_id);
+ $check_list = $this->so->get_single($check_list_id);
$control =
$this->so_control->get_single($check_list->get_control_id());
// Fetches all control items for check list
@@ -363,7 +538,7 @@
function view_open_cases(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single($check_list_id);
+ $check_list = $this->so->get_single($check_list_id);
$open_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, 'open', null,
'return_array');
@@ -379,7 +554,7 @@
function view_closed_cases(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single($check_list_id);
+ $check_list = $this->so->get_single($check_list_id);
$closed_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, 'closed',
null, 'return_array');
@@ -395,7 +570,7 @@
function view_measurements(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single($check_list_id);
+ $check_list = $this->so->get_single($check_list_id);
// Fetches check items that registeres measurement
$measurement_check_items =
$this->so_check_item->get_check_items($check_list_id, null,
'control_item_type_2', "return_array");
@@ -408,58 +583,61 @@
self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_measurements'), $data );
}
-*/
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function view_check_lists_for_control()
- {
- $control_id = phpgw::get_var('id');
- $control = $this->so_control->get_single($control_id);
-
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-
- $check_list_array =
$this->so->get_check_lists_for_control( $control_id );
-
+
+ function view_control_items(){
+ $check_list_id = phpgw::get_var('check_list_id');
+ $check_list = $this->so->get_single($check_list_id);
+
+ $control =
$this->so_control->get_single($check_list->get_control_id());
+ $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
+
+ $saved_groups_with_items_array = array();
+
+ //Populating array with saved control items for each
group
+ foreach ($control_groups as $control_group)
+ {
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
+
+ $control_item =
$this->so_control_item->get_single($control_item_id);
+
+ $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
+ }
+
$data = array
(
- 'control_as_array' => $control->toArray(),
- 'check_list_array' => $check_list_array,
- 'date_format' => $date_format
+ 'saved_groups_with_items_array' =>
$saved_groups_with_items_array,
+ 'check_list'
=> $check_list->toArray()
);
-
- self::render_template_xsl('view_check_lists', $data);
+
+
self::render_template_xsl('check_list/view_control_items', $data);
}
- */
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function view_control_items_for_control()
- {
- $control_id = phpgw::get_var('control_id');
-
- $control = $this->so_control->get_single($control_id);
- $control_groups_array =
$this->so_control_group_list->get_control_groups_by_control( $control_id );
+ function add_check_item_to_list(){
+ $control_item_id = phpgw::get_var('control_item_id');
+ $check_list_id = phpgw::get_var('check_list_id');
+ $comment = phpgw::get_var('comment');
+ $status = (int)phpgw::get_var('status');
+ $type = phpgw::get_var('type');
- $saved_groups_with_items_array = array();
+ $check_item_obj = new controller_check_item();
+ $check_item_obj->set_status($status);
+ $check_item_obj->set_comment($comment);
+ $check_item_obj->set_check_list_id($check_list_id);
+ $check_item_obj->set_control_item_id($control_item_id);
- foreach ($control_groups_array as $control_group)
- {
- $control_group_id = $control_group->get_id();
- $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
$control_group_id);
-
- $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
+ if($type == 'control_item_type_2'){
+ $measurement = phpgw::get_var('measurement');
+ $check_item_obj->set_measurement($measurement);
}
+
+ $check_item_id = $this->so_check_item->store(
$check_item_obj );
- $data = array
- (
- 'control_as_array'
=> $control->toArray(),
- 'saved_groups_with_items_array' =>
$saved_groups_with_items_array
- );
-
- self::render_template_xsl('view_check_list', $data);
+ if($check_item_id > 0)
+ return json_encode( array( "saveStatus" =>
"saved" ) );
+ else
+ return json_encode( array( "saveStatus" =>
"not_saved" ) );
}
- */
- /*
+
public function save_check_items(){
$check_item_ids = phpgw::get_var('check_item_ids');
$check_list_id = phpgw::get_var('check_list_id');
@@ -476,7 +654,7 @@
$this->so_check_item->store( $check_item );
}
- $this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list', 'check_list_id'=>$check_list_id));
+ $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.view_check_list',
'check_list_id'=>$check_list_id));
}
public function save_check_item(){
@@ -510,181 +688,23 @@
return json_encode( array( "status" =>
"not_saved" ) );
}
- public function add_check_item_to_list(){
- $control_item_id = phpgw::get_var('control_item_id');
+ // Returns check list info as JSON
+ public function get_check_list_info()
+ {
$check_list_id = phpgw::get_var('check_list_id');
- $comment = phpgw::get_var('comment');
- $status = (int)phpgw::get_var('status');
- $type = phpgw::get_var('type');
-
- $check_item_obj = new controller_check_item();
- $check_item_obj->set_status($status);
- $check_item_obj->set_comment($comment);
- $check_item_obj->set_check_list_id($check_list_id);
- $check_item_obj->set_control_item_id($control_item_id);
-
- if($type == 'control_item_type_2'){
- $measurement = phpgw::get_var('measurement');
- $check_item_obj->set_measurement($measurement);
- }
+ $check_list =
$this->so_check_list->get_single_with_check_items($check_list_id, "open");
- $check_item_id = $this->so_check_item->store(
$check_item_obj );
-
- if($check_item_id > 0)
- return json_encode( array( "saveStatus" =>
"saved" ) );
- else
- return json_encode( array( "saveStatus" =>
"not_saved" ) );
+ return json_encode( $check_list );
}
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function save_check_list(){
- $control_id = phpgw::get_var('control_id');
- $control = $this->so_control->get_single($control_id);
+ public function get_cases_for_check_list()
+ {
+ $check_list_id = phpgw::get_var('check_list_id');
- $start_date = $control->get_start_date();
- $end_date = $control->get_end_date();
- $repeat_type = $control->get_repeat_type();
- $repeat_interval = $control->get_repeat_interval();
-
-
- $deadline = $start_date;
-
- // Saving check_list
- $new_check_list = new controller_check_list();
- $new_check_list->set_control_id( $control_id );
- $new_check_list->set_status( $status );
- $new_check_list->set_comment( $comment );
- $new_check_list->set_deadline( $deadline );
-
- $check_list_id = $this->so_check_list->store(
$new_check_list );
-
- $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
-
- foreach($control_items_list as $control_item){
-
- $status = 0;
- $comment = "Kommentar for sjekk item";
-
- // Saving check_items for a list
- $new_check_item = new controller_check_item();
- $new_check_item->set_check_list_id(
$check_list_id );
-
- $new_check_item->set_control_item_id(
$control_item->get_id() );
- $new_check_item->set_status( $status );
- $new_check_item->set_comment( $comment );
-
- $saved_check_item =
$this->so_check_item->store( $new_check_item );
- }
-
- $this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list_for_control',
'control_id'=>$control_id));
+ $check_items_with_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, "open", null,
"return_array");
+
+ return json_encode( $check_items_with_cases );
}
- */
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
- public function make_check_list_for_control(){
- $control_id = phpgw::get_var('control_id');
- $control = $this->so_control->get_single($control_id);
-
- $start_date = $control->get_start_date();
- $end_date = $control->get_end_date();
- $repeat_type = $control->get_repeat_type();
- $repeat_interval = $control->get_repeat_interval();
-
- $status = true;
- $comment = "Kommentar for sjekkliste";
- $deadline = $start_date;
-
- // Saving check_list
- $new_check_list = new controller_check_list();
- $new_check_list->set_control_id( $control_id );
- $new_check_list->set_status( $status );
- $new_check_list->set_comment( $comment );
- $new_check_list->set_deadline( $deadline );
-
- $check_list_id = $this->so_check_list->store(
$new_check_list );
-
- $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
-
- foreach($control_items_list as $control_item){
-
- $status = true;
- $comment = "Kommentar for sjekk item";
-
- // Saving check_items for a list
- $new_check_item = new controller_check_item();
- $new_check_item->set_check_list_id(
$check_list_id );
-
- $new_check_item->set_control_item_id(
$control_item->get_id() );
- $new_check_item->set_status( $status );
- $new_check_item->set_comment( $comment );
-
- $saved_check_item =
$this->so_check_item->store( $new_check_item );
- }
-
- $this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list_for_control',
'control_id'=>$control_id));
- }
- */
-
- public function query()
- {
- $params = array(
- 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
- 'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
- 'query' => phpgw::get_var('query'),
- 'sort' => phpgw::get_var('sort'),
- 'dir' => phpgw::get_var('dir'),
- 'filters' => $filters
- );
-
- $search_for = phpgw::get_var('query');
-
-
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
- {
- $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- }
- else {
- $user_rows_per_page = 10;
- }
-
- // YUI variables for paging and sorting
- $start_index = phpgw::get_var('startIndex', 'int');
- $num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
- $sort_field = phpgw::get_var('sort');
- if($sort_field == null)
- {
- $sort_field = 'control_id';
- }
- $sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
- //Create an empty result set
- $records = array();
-
- //Retrieve a contract identifier and load corresponding
contract
-/* $control_id = phpgw::get_var('control_id');
- if(isset($control_id))
- {
- $control = $this->so->get_single($control_id);
- }
-*/
- $result_objects = $this->so->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
- $object_count = $this->so->get_count($search_for,
$search_type, $filters);
- //var_dump($result_objects);
-
- $results = array();
-
- foreach($result_objects as $check_list_obj)
- {
- $results['results'][] =
$check_list_obj->serialize();
- }
-
- $results['total_records'] = $object_count;
- $results['start'] = $params['start'];
- $results['sort'] = $params['sort'];
- $results['dir'] = $params['dir'];
-
- array_walk($results["results"], array($this,
"_add_links"), "controller.uicheck_list.view_check_lists_for_control");
-
- return $this->yui_results($results);
- }
- }
\ No newline at end of file
+ public function query(){}
+ }
Deleted:
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -1,616 +0,0 @@
-<?php
- /**
- * phpGroupWare - controller: a part of a Facilities Management System.
- *
- * @author Erink Holm-Larsen <address@hidden>
- * @author Torstein Vadla <address@hidden>
- * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/
- * @package property
- * @subpackage controller
- * @version $Id$
- */
-
- phpgw::import_class('phpgwapi.yui');
- phpgw::import_class('controller.uicommon');
- phpgw::import_class('controller.socontrol_area');
- phpgw::import_class('controller.socheck_list');
-
- include_class('controller', 'check_list', 'inc/model/');
- include_class('controller', 'date_generator', 'inc/component/');
- include_class('controller', 'status_checker', 'inc/helper/');
- include_class('controller', 'date_helper', 'inc/helper/');
- include_class('controller', 'check_item', 'inc/model/');
-
- class controller_uicheck_list_for_location extends controller_uicommon
- {
- private $so;
- private $so_control_area;
- private $so_control;
- private $so_control_item;
- private $so_check_item;
- private $so_procedure;
- private $so_control_group_list;
- private $so_control_item_list;
-
- var $public_functions = array(
-
'add_check_list' => true,
-
'save_check_list' => true,
-
'edit_check_list' => true,
-
'create_case_message' => true,
-
'view_control_info' => true,
-
'view_cases_for_check_list' => true,
-
'update_check_list' => true,
-
'print_check_list' => true,
-
'register_case' => true,
-
'view_open_cases' => true,
-
'view_closed_cases' => true,
-
'view_measurements' => true,
-
'view_control_details' => true,
-
'view_control_items' => true,
-
'add_check_item_to_list' => true,
-
'save_check_items' => true,
-
'save_check_item' => true,
-
'get_check_list_info' => true,
-
'get_cases_for_check_list' => true
- );
-
- function __construct()
- {
- parent::__construct();
-
- $this->so_control_area =
CreateObject('controller.socontrol_area');
- $this->so_control =
CreateObject('controller.socontrol');
- $this->so =
CreateObject('controller.socheck_list');
- $this->so_control_item =
CreateObject('controller.socontrol_item');
- $this->so_check_item =
CreateObject('controller.socheck_item');
- $this->so_procedure =
CreateObject('controller.soprocedure');
- $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
- $this->so_control_item_list =
CreateObject('controller.socontrol_item_list');
-
-
self::set_active_menu('controller::control::check_list');
- }
-
- function add_check_list(){
- $location_code = phpgw::get_var('location_code');
- $control_id = phpgw::get_var('control_id');
- $date = phpgw::get_var('date');
-
- $control = $this->so_control->get_single($control_id);
-
- if($date == null || $date == ''){
- $todays_date = mktime(0,0,0, date("m"),
date("d"), date("Y"));
- $period_start_date = $todays_date;
-
- if( $control->get_repeat_type() == 1 )
- {
- $period_end_date = mktime(0,0,0,
date("m")+1, date("d"), date("Y"));
- }else if( $control->get_repeat_type() == 2 )
- {
- $period_end_date = mktime(0,0,0,
date("m"), date("d"), date("Y") + 1);
- }else if( $control->get_repeat_type() == 3 )
- {
- $period_end_date = mktime(0,0,0,
date("m"), date("d"), date("Y") + $control->get_repeat_interval());
- }
-
- $date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$period_start_date, $period_end_date, $control->get_repeat_type(),
$control->get_repeat_interval());
-
- $calendar_array = $date_generator->get_dates();
- }
- else
- {
- $calendar_array[] = $date;
- }
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'location_array' => $location_array,
- 'control_array' => $control->toArray(),
- 'deadline' =>
$calendar_array[0],
- 'date_format' => $date_format
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/add_check_list'),
$data);
- }
-
- function edit_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $location_code = $check_list->get_location_code();
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'control' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'location_array' => $location_array,
- 'date_format' => $date_format
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
- }
-
- function view_cases_for_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $location_code = $check_list->get_location_code();
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'control' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'location_array' => $location_array,
- 'date_format' => $date_format
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
- }
-
- function save_check_list(){
- $location_code = phpgw::get_var('location_code');
- $control_id = phpgw::get_var('control_id');
- $status = (int)phpgw::get_var('status');
-
- $deadline_date = phpgw::get_var('deadline_date',
'string');
- $planned_date = phpgw::get_var('planned_date',
'string');
- $completed_date = phpgw::get_var('completed_date',
'string');
-
- $comment = phpgw::get_var('comment', 'string');
-
- if($planned_date != '')
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
-
- if($deadline_date != '')
- $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date, "d/m-Y" );
-
- if($completed_date != '')
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
-
- $check_list = new controller_check_list();
- $check_list->set_location_code($location_code);
- $check_list->set_control_id($control_id);
- $check_list->set_status($status);
- $check_list->set_comment($comment);
- $check_list->set_deadline( $deadline_date_ts );
- $check_list->set_planned_date($planned_date_ts);
- $check_list->set_completed_date($completed_date_ts);
-
- $check_list_id = $this->so->store($check_list);
-
- $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list',
'check_list_id'=>$check_list_id));
- }
-
- function create_case_message(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list_with_check_items =
$this->so->get_single_with_check_items($check_list_id);
-
- $control_id =
$check_list_with_check_items["control_id"];
- $control = $this->so_control->get_single( $control_id );
-
- $location_code =
$check_list_with_check_items["location_code"];
-
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'location_array' =>
$location_array,
- 'control_array' =>
$control->toArray(),
- 'check_list' =>
$check_list_with_check_items,
- 'date_format' => $date_format
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
- self::render_template_xsl('create_case_messsage',
$data);
- }
-
- public function view_control_info(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
- $cats->supress_info = true;
-
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
- array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
- $control_areas_array2 = array();
-
- foreach($control_areas['cat_list'] as $cat_list)
- {
- $control_areas_array2[] = array
- (
- 'id' => $cat_list['cat_id'],
- 'name' => $cat_list['name'],
- );
- }
-
- // Fetches prosedures that are related to first control
area in list
- $control_area_id = $control_areas_array2[1]['id'];
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
- $role_array = $this->so_control->get_roles();
-
- $location_code = $check_list->get_location_code();
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'location_array' =>
$location_array,
- 'control' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'date_format' => $date_format,
- 'control_areas_array2' => array('options' =>
$control_areas_array2),
- 'procedures_array' =>
$procedures_array,
- 'role_array' => $role_array
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
- }
-
- public function update_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
- $status = (int)phpgw::get_var('status');
- $comment = phpgw::get_var('comment');
- $deadline_date = phpgw::get_var('deadline_date');
- $completed_date = phpgw::get_var('completed_date');
- $planned_date = phpgw::get_var('planned_date');
-
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
-
- // Fetches check_list from DB
- $update_check_list =
$this->so->get_single($check_list_id);
- $update_check_list->set_status( $status );
- $update_check_list->set_comment( $comment );
- $update_check_list->set_completed_date(
$completed_date_ts );
- $update_check_list->set_planned_date( $planned_date_ts
);
-
- $check_list_id = $this->so->update( $update_check_list
);
-
- if($check_list_id > 0)
- return json_encode( array( "saveStatus" =>
"updated" ) );
- else
- return json_encode( array( "saveStatus" =>
"not_updated" ) );
- }
-
- public function print_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
- $check_list = $this->so->get_single($check_list_id);
-
- $control =
$this->so_control->get_single($check_list->get_control_id());
- $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
-
- $saved_groups_with_items_array = array();
-
- //Populating array with saved control items for each
group
- foreach ($control_groups as $control_group)
- {
- $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
-
- $control_item =
$this->so_control_item->get_single($control_item_id);
-
- $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
- }
-
- $data = array
- (
- 'saved_groups_with_items_array' =>
$saved_groups_with_items_array,
- 'check_list'
=> $check_list->toArray()
- );
-
-
self::render_template_xsl('check_list/print_check_list', $data);
- }
-
- function view_control_details(){
- $control_id = phpgw::get_var('control_id');
-
- $control = $this->so_control->get_single($control_id);
-
- // Sigurd: START as categories
- $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
- $cats->supress_info = true;
-
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
- array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
- $control_areas_array2 = array();
- foreach($control_areas['cat_list'] as $cat_list)
- {
- $control_areas_array2[] = array
- (
- 'id' => $cat_list['cat_id'],
- 'name' => $cat_list['name'],
- );
- }
- // END as categories
- $control_area_id = $control_areas_array2[1]['id'];
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
- $role_array = $this->so_control->get_roles();
-
- $data = array
- (
- 'control' => $control->toArray(),
- 'procedures_array' =>
$procedures_array,
- 'role_array' =>
$role_array
- );
-
-
self::render_template_xsl('check_list/view_control_details', $data);
- }
-
- function register_case(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- // Fetches all control items for check list
- $control_items_for_check_list = array();
-
- $control_items =
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
- $check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
-
- $remove_control_item_ids_array = array();
-
- foreach($check_items as $check_item){
- if($check_item->get_control_item()->get_type()
== "control_item_type_2" & $check_item->get_status() == 1){
- $remove_control_item_ids_array[] =
$check_item->get_control_item_id();
- }
- }
-
- foreach($control_items as $control_item){
- if( !in_array($control_item->get_id(),
$remove_control_item_ids_array) ){
- $control_items_for_check_list[] =
$control_item->toArray();
- }
- }
-
- $location_array = execMethod(
'property.bolocation.read_single', array('location_code' =>
$check_list->get_location_code()) );
-
- $data = array
- (
- 'control'
=> $control->toArray(),
- 'check_list'
=> $check_list->toArray(),
- 'location_array' => $location_array,
- 'control_items_for_check_list' =>
$control_items_for_check_list,
- );
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
- }
-
- function view_open_cases(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
-
- $open_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, 'open', null,
'return_array');
-
- $data = array
- (
- 'open_check_items_and_cases' =>
$open_check_items_and_cases,
- 'check_list'
=> $check_list->toArray()
- );
-
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_open_cases'), $data );
- }
-
- function view_closed_cases(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
-
- $closed_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, 'closed',
null, 'return_array');
-
- $data = array
- (
- 'closed_check_items_and_cases' =>
$closed_check_items_and_cases,
- 'check_list'
=> $check_list->toArray()
- );
-
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_closed_cases'), $data );
- }
-
- function view_measurements(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
-
- // Fetches check items that registeres measurement
- $measurement_check_items =
$this->so_check_item->get_check_items($check_list_id, null,
'control_item_type_2', "return_array");
-
- $data = array
- (
- 'measurement_check_items' =>
$measurement_check_items,
- 'check_list' =>
$check_list->toArray()
- );
-
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_measurements'), $data );
- }
-
- function view_control_items(){
- $check_list_id = phpgw::get_var('check_list_id');
- $check_list = $this->so->get_single($check_list_id);
-
- $control =
$this->so_control->get_single($check_list->get_control_id());
- $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
-
- $saved_groups_with_items_array = array();
-
- //Populating array with saved control items for each
group
- foreach ($control_groups as $control_group)
- {
- $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
-
- $control_item =
$this->so_control_item->get_single($control_item_id);
-
- $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
- }
-
- $data = array
- (
- 'saved_groups_with_items_array' =>
$saved_groups_with_items_array,
- 'check_list'
=> $check_list->toArray()
- );
-
-
self::render_template_xsl('check_list/view_control_items', $data);
- }
-
- function add_check_item_to_list(){
- $control_item_id = phpgw::get_var('control_item_id');
- $check_list_id = phpgw::get_var('check_list_id');
- $comment = phpgw::get_var('comment');
- $status = (int)phpgw::get_var('status');
- $type = phpgw::get_var('type');
-
- $check_item_obj = new controller_check_item();
- $check_item_obj->set_status($status);
- $check_item_obj->set_comment($comment);
- $check_item_obj->set_check_list_id($check_list_id);
- $check_item_obj->set_control_item_id($control_item_id);
-
- if($type == 'control_item_type_2'){
- $measurement = phpgw::get_var('measurement');
- $check_item_obj->set_measurement($measurement);
- }
-
- $check_item_id = $this->so_check_item->store(
$check_item_obj );
-
- if($check_item_id > 0)
- return json_encode( array( "saveStatus" =>
"saved" ) );
- else
- return json_encode( array( "saveStatus" =>
"not_saved" ) );
- }
-
- public function save_check_items(){
- $check_item_ids = phpgw::get_var('check_item_ids');
- $check_list_id = phpgw::get_var('check_list_id');
-
- foreach($check_item_ids as $check_item_id){
- $status = phpgw::get_var('status_' .
$check_item_id);
- $comment = phpgw::get_var('comment_' .
$check_item_id);
-
- $check_item =
$this->so_check_item->get_single($check_item_id);
-
- $check_item->set_status( $status );
- $check_item->set_comment( $comment );
-
- $this->so_check_item->store( $check_item );
- }
-
- $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.view_check_list',
'check_list_id'=>$check_list_id));
- }
-
- public function save_check_item(){
- $check_item_id = phpgw::get_var('check_item_id');
- $comment = phpgw::get_var('comment');
- $status = (int)phpgw::get_var('status');
-
- $check_item =
$this->so_check_item->get_single($check_item_id);
- $control_item_id = $check_item->get_control_item_id();
-
- $control_item =
$this->so_control_item->get_single($check_item->get_control_item_id());
-
- if($control_item->get_type() == 'control_item_type_2')
- {
- $measurement = phpgw::get_var('measurement');
- $check_item->set_measurement( $measurement );
- }
-
- $check_item->set_status( $status );
- $check_item->set_comment( $comment );
-
- $check_item_id = $this->so_check_item->store(
$check_item );
-
- if($check_item_id > 0){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_item->get_check_list_id() );
-
- return json_encode( array( "saveStatus" =>
"saved" ) );
- }
- else
- return json_encode( array( "status" =>
"not_saved" ) );
- }
-
- // Returns check list info as JSON
- public function get_check_list_info()
- {
- $check_list_id = phpgw::get_var('check_list_id');
- $check_list =
$this->so_check_list->get_single_with_check_items($check_list_id, "open");
-
- return json_encode( $check_list );
- }
-
- public function get_cases_for_check_list()
- {
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_items_with_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, "open", null,
"return_array");
-
- return json_encode( $check_items_with_cases );
- }
-
- public function query(){}
- }
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -274,8 +274,6 @@
$tabs = $this->make_tab_menu($control_id);
- print_r( $tabs );
-
$data = array
(
'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
@@ -542,7 +540,6 @@
if($control_id > 0){
- echo " Detaljer ";
$control = $this->so->get_single($control_id);
$tabs[] = array(
@@ -555,7 +552,6 @@
if(count($saved_control_groups) > 0)
{
- echo " Grupper ";
$tabs[] = array(
'label' => "2:
" . lang('Choose_control_groups'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups',
@@ -566,7 +562,6 @@
if(count($saved_control_items) > 0)
{
- echo " Punkter ";
$tabs[] = array(
'label'
=> "3: " . lang('Choose_control_items'),
'link'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
@@ -596,13 +591,6 @@
));
}
-
-
-
-
- echo " 2: ";
- print_r($tabs);
-
return $tabs;
}
@@ -652,7 +640,7 @@
$value['parameters'] = array();
$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'controller.uicheck_list_for_location.add_check_list', 'location_code' =>
$value['location_code'])));
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'controller.uicheck_list.add_check_list', 'location_code' =>
$value['location_code'])));
$value['labels'][] = lang('add_check_list_to_location');
$value['parameters'][] = "control_id";
}
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage controller
- * @version $Id: class.uicheck_list_for_location.inc.php 8628 2012-01-21
10:42:05Z vator $
+ * @version $Id: class.uicheck_list.inc.php 8628 2012-01-21 10:42:05Z
vator $
*/
phpgw::import_class('phpgwapi.yui');
@@ -98,44 +98,24 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- $building_types =
execMethod('property.soadmin_location.read',array());
- $type_id = 1;
+ // Sigurd: START as categories
+ $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
+ $cats->supress_info = true;
- $category_types =
$this->bocommon->select_category_list(array(
-
'format'=>'filter',
-
'selected' =>
$this->cat_id,
-
'type'
=>'location',
-
'type_id'
=>$type_id,
-
'order'=>'descr'
-
));
-
- $district_list =
$this->bocommon->select_district_list('filter',$this->district_id);
- $default_value = array ('id'=>'','name'=>lang('no
district'));
- array_unshift($district_list,$default_value);
-
- $part_of_town_list =
$this->bocommon->select_part_of_town('filter',$this->part_of_town_id,$this->district_id);
- $default_value = array ('id'=>'','name'=>lang('no part
of town'));
- array_unshift($part_of_town_list,$default_value);
-
- $_role_criteria = array
- (
- 'type' =>
'responsibility_role',
- 'filter' =>
array('location' => ".location.{$type_id}"),
- 'order' => 'name'
- );
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
+ $control_areas_array2 = array();
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_areas_array2[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
+ // END as categories
- $responsibility_roles_list =
execMethod('property.sogeneric.get_list',$_role_criteria);
- $default_value = array ('id'=>'','name'=>lang('no
role'));
- array_unshift ($responsibility_roles,$default_value);
-
- $control_areas_array =
$this->so_control_area->get_control_areas_as_array();
- $controls_array =
$this->so_control->get_controls_by_control_area($control_areas_array[0]['id']);
- $control_id = $control_areas_array[0]['id'];
-
- if($control_id == null)
- $control_id = 0;
-
$tabs = array( array(
'label' =>
lang('View_locations_for_control')
), array(
@@ -146,8 +126,7 @@
$data = array(
'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($tabs, 0),
'view' =>
"view_locations_for_control",
- 'control_area_array' => $control_areas_array,
- 'control_array' =>
$control_array,
+ 'control_areas_array2' =>
$control_areas_array2,
'locations_table' => array(
'source' =>
self::link(array('menuaction' =>
'controller.uicontrol.get_locations_for_control', 'control_id' => $control_id
,'phpgw_return_as' => 'json')),
'field' => array(
@@ -237,6 +216,24 @@
$control_areas_array =
$this->so_control_area->get_control_areas_as_array();
+ // Sigurd: START as categories
+ $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
+ $cats->supress_info = true;
+
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
+ $control_areas_array2 = array();
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_areas_array2[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
+ // END as categories
+
+
$tabs = array( array(
'label' =>
lang('View_locations_for_control'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_location.index'))
@@ -249,7 +246,7 @@
'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 1),
'view'
=> "add_location_to_control",
'control_filters' =>
array(
- 'control_area_array' =>
$control_areas_array,
+ 'control_areas_array2' =>
$control_areas_array2,
'control_array'
=> $control_array
),
'filter_form' =>
array(
Modified:
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -19,24 +19,27 @@
$calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
+ echo " Kontroll: " . $control->get_title();
+
// Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
$check_list_status_info = new
check_list_status_info();
$check_list_status_info->set_check_list_id(
$check_list->get_id() );
- $todays_date = mktime(0,0,0,date("m"),
date("d"), date("Y"));
-
- if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() >
$todays_date)
+ $todays_date_ts = mktime(0,0,0,date("m"),
date("d"), date("Y"));
+
+ echo " Dato: " . $check_list->get_id() . "
deadline: " . date("d/m-Y", $check_list->get_deadline());
+
+ if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() >
$todays_date_ts)
{
$status = "control_planned";
-
$check_list_status_info->set_info_text("Planlagt utført: " .
$check_list->get_planned_date());
}
- else if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() <
$todays_date)
+ else if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() <
$todays_date_ts )
{
$status =
"control_not_accomplished_with_info";
}
- else if( $check_list->get_status() == 0 &
$check_list->get_deadline() > $todays_date )
+ else if( $check_list->get_status() == 0 &
$check_list->get_deadline() < $todays_date_ts )
{
$status = "control_not_accomplished";
}
@@ -136,14 +139,13 @@
function init_calendar( $control, $calendar_array, $num, $period_type ){
- // Initialises twelve_months_array
for($i=1;$i<=$num;$i++){
$calendar_array[$i] = null;
}
$date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$this->period_start_date, $this->period_end_date, $control->get_repeat_type(),
$control->get_repeat_interval());
$dates_array = $date_generator->get_dates();
-
+
// Inserts dates on behalf of repeat type and repeat interval
foreach($dates_array as $date){
Modified:
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -39,10 +39,14 @@
$this->calendar_array[] = $interval_date;
- if($this->repeat_type == 1 || $this->repeat_type == 0)
+ if($this->repeat_type == 0)
{
$interval_date = mktime(0,0,0, date("m",
$interval_date), date("d", $interval_date)+$this->repeat_interval, date("Y",
$interval_date));
}
+ else if($this->repeat_type == 1)
+ {
+ $interval_date = mktime(0,0,0, date("m",
$interval_date), date("d", $interval_date) + ($this->repeat_interval * 7),
date("Y", $interval_date));
+ }
else if($this->repeat_type == 2)
{
$month = date("m",
$interval_date)+$this->repeat_interval;
@@ -89,6 +93,10 @@
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
date("m", $this->start_date), date("y", $this->start_date));
$search_date = mktime(0,0,0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
}
+ else if( $this->repeat_type == 3 ){
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
12, date("y", $this->start_date));
+ $search_date = mktime(0,0,0, 12, $num_days_in_month,
date("y", $this->start_date));
+ }
return $search_date;
}
Modified: branches/Version-1_0-branch/controller/inc/hook_home.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-01-30 18:39:47 UTC (rev 8731)
@@ -38,7 +38,7 @@
$so_control = CreateObject('controller.socontrol');
//echo '<H1> Hook for controller </H1>';
- $location_code = '1101';
+ //$location_code = '1101';
$year = phpgw::get_var('year');
if(empty($year)){
@@ -62,28 +62,100 @@
$location_finder = new location_finder();
$my_locations = $location_finder->get_responsibilities( $criteria );
- //print_r($my_locations);
- if(empty($location_code)){
- $location_code = $my_locations[0]["location_code"];
+ $repeat_type = null;
+ $controls_for_location_array = array();
+ foreach($my_locations as $location)
+ {
+ $controls_for_location_array[] =
array($location["location_code"],
$so_control->get_controls_by_location($location["location_code"],
$from_date_ts, $to_date_ts, $repeat_type ));
}
- $repeat_type = null;
-
- $controls_for_location_array =
$so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type );
- //var_dump($controls_for_location_array);
$controls_array = array();
$control_dates = array();
- foreach($controls_for_location_array as $control){
- $date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$from_date_ts, $to_date_ts, $control->get_repeat_type(),
$control->get_repeat_interval());
- $controls_array[] = array($control,
$date_generator->get_dates());
+ foreach($controls_for_location_array as $control_arr){
+ $current_location = $control_arr[0];
+ $controls_for_loc_array = $control_arr[1];
+ foreach($controls_for_loc_array as $control)
+ {
+ $date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$from_date_ts, $to_date_ts, $control->get_repeat_type(),
$control->get_repeat_interval());
+ $controls_array[] = array($current_location, $control,
$date_generator->get_dates());
+ }
}
+
+ $portalbox1 = CreateObject('phpgwapi.listbox', array
+ (
+ 'title' => "Mine planlagte kontroller",
+ 'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+ 'width' => '100%',
+ 'outerborderwidth' => '0',
+ 'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', '.png', False)
+ ));
- $location_array = execMethod('property.bolocation.read_single',
array('location_code' => $location_code));
+ $app_id = $GLOBALS['phpgw']->applications->name2id('controller');
+ if( !isset($GLOBALS['portal_order']) ||!in_array($app_id,
$GLOBALS['portal_order']) )
+ {
+ $GLOBALS['portal_order'][] = $app_id;
+ }
+ $var = array
+ (
+ 'up' => array('url' => '/set_box.php', 'app' =>
$app_id),
+ 'down' => array('url' => '/set_box.php', 'app' =>
$app_id),
+ 'close' => array('url' => '/set_box.php', 'app' =>
$app_id),
+ 'question' => array('url' => '/set_box.php', 'app'
=> $app_id),
+ 'edit' => array('url' => '/set_box.php', 'app' =>
$app_id)
+ );
+
+ foreach ( $var as $key => $value )
+ {
+ // $portalbox->set_controls($key,$value);
+ }
+
+ $category_name = array(); // caching
- $portalbox = CreateObject('phpgwapi.listbox', array
+ $cats = CreateObject('phpgwapi.categories', -1, 'controller',
'.control');
+ $cats->supress_info = true;
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals'
=> true,'use_acl' => $this->_category_acl));
+
+ $portalbox1->data = array();
+ $portalbox1_data = array();
+ foreach ($controls_array as $control_instance)
+ {
+ $curr_location = $control_instance[0];
+ $current_control = $control_instance[1];
+ $check_lists =
$so->get_planned_check_lists_for_control($current_control->get_id());
+ $location_array = execMethod('property.bolocation.read_single',
array('location_code' => $curr_location));
+ $location_name = $location_array["loc1_name"];
+ foreach($control_areas['cat_list'] as $area)
+ {
+ if($area['cat_id'] ==
$current_control->get_control_area_id())
+ {
+ $control_area_name = $area['name'];
+ }
+ }
+ foreach($check_lists as $check_list)
+ {
+ $next_date = "Planlagt: " . date('d/m/Y',
$check_list->get_planned_date());
+ $portalbox1_data[] = array
+ ($check_list->get_planned_date(), array
+ (
+ 'text' => "{$location_name} -
{$control_area_name} - {$current_control->get_title()} :: {$next_date}",
+ 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list.edit_check_list',
'check_list_id' => $check_list->get_id()))
+ ));
+ }
+ }
+ //sort data by planned date for check list
+ sort($portalbox1_data);
+ foreach($portalbox1_data as $check_list_dates)
+ {
+ $portalbox1->data[] = $check_list_dates[1];
+ }
+ echo "\n".'<!-- BEGIN checklist info
-->'."\n".$portalbox1->draw()."\n".'<!-- END checklist info -->'."\n";
+
+ $portalbox2 = CreateObject('phpgwapi.listbox', array
(
- 'title' => "Mine kontroller",
+ 'title' => "Mine tildelte kontroller",
'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -113,19 +185,64 @@
$category_name = array(); // caching
- $portalbox->data = array();
+ $portalbox2->data = array();
+ $portalbox2_data = array();
foreach ($controls_array as $control_instance)
{
- $current_control = $control_instance[0];
- $current_dates = $control_instance[1];
+ $curr_location = $control_instance[0];
+ $current_control = $control_instance[1];
+ $check_lists =
$so->get_planned_check_lists_for_control($current_control->get_id());
+ //$control_location =
$so_control->getLocationCodeFromControl($current_control->get_id());
+ $location_array = execMethod('property.bolocation.read_single',
array('location_code' => $curr_location));
+ $location_name = $location_array["loc1_name"];
+ foreach($control_areas['cat_list'] as $area)
+ {
+ if($area['cat_id'] ==
$current_control->get_control_area_id())
+ {
+ $control_area_name = $area['name'];
+ }
+ }
+ $planned_lists = array();
+ foreach($check_lists as $check_list)
+ {
+ $planned_lists = $check_list->get_deadline();
+ }
+ $current_dates = $control_instance[2];
+
foreach($current_dates as $current_date)
{
- $next_date = date('d/m/Y', $current_date);
- $portalbox->data[] = array
- (
- 'text' => "{$current_control->get_title()} ::
Fristdato: {$next_date}",
- 'link' => $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'controller.uicheck_list_for_location.add_check_list',
'date' => $current_date, 'control_id' => $current_control->get_id(),
'location_code' => '1101'))
- );
+ if(isset($check_lists))
+ {
+ foreach($check_lists as $check_list)
+ {
+ if($current_date !=
$check_list->get_deadline())
+ {
+ $next_date = "Fristdato: " .
date('d/m/Y', $current_date);
+ $portalbox2_data[] = array
+ ($current_date, array
+ (
+ 'text' =>
"{$location_name} - {$control_area_name} - {$current_control->get_title()} ::
{$next_date}",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'date' => $current_date, 'control_id'
=> $current_control->get_id(), 'location_code' => '1101'))
+ ));
+ }
+ }
+ }
+ else
+ {
+ $next_date = "Fristdato: " . date('d/m/Y',
$current_date);
+ $portalbox2_data[] = array
+ ($current_date, array
+ (
+ 'text' => "{$location_name} -
{$control_area_name} - {$current_control->get_title()} :: {$next_date}",
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'date' => $current_date, 'control_id'
=> $current_control->get_id(), 'location_code' => '1101'))
+ ));
+ }
}
}
- echo "\n".'<!-- BEGIN checklist info
-->'."\n".$portalbox->draw()."\n".'<!-- END checklist info -->'."\n";
+ //sort data by due date for check list
+ sort($portalbox2_data);
+ foreach($portalbox2_data as $check_list_dates)
+ {
+ $portalbox2->data[] = $check_list_dates[1];
+ }
+ echo "\n".'<!-- BEGIN assigned checklist info
-->'."\n".$portalbox2->draw()."\n".'<!-- END assigned checklist info -->'."\n";
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-01-30 18:30:07 UTC (rev 8730)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-01-30 18:39:47 UTC (rev 8731)
@@ -17,7 +17,7 @@
window.location.href = requestUrl;
});
- // file: uicheck_list_for_location.xsl
+ // file: uicheck_list.xsl
// When control area is selected, controls are fetched from db and
control select list is populated
$("#control_area_list option").click(function () {
var control_area_id = $(this).val();
@@ -230,7 +230,7 @@
var add_param = $(thisA).find("span").text();
- var requestUrl =
"http://portico/pe/index.php?menuaction=controller.uicheck_list_for_location.get_cases_for_check_list";
+ add_param;
+ var requestUrl =
"http://portico/pe/index.php?menuaction=controller.uicheck_list.get_cases_for_check_list";
+ add_param;
$.ajax({
type: 'POST',
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -153,7 +153,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
<xsl:text>&date=</xsl:text>
<xsl:value-of select="info/date"/>
<xsl:text>&control_id=</xsl:text>
@@ -169,7 +169,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -181,7 +181,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -195,7 +195,7 @@
<div id="info_box" style="position:absolute;display:none;"></div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -209,7 +209,7 @@
<div id="info_box" style="position:absolute;display:none;"></div>
<a class="view_check_list">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -226,7 +226,7 @@
<div id="info_box" style="position:absolute;display:none;"></div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -239,7 +239,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
<xsl:text>&date=</xsl:text>
<xsl:value-of select="info/date"/>
<xsl:text>&control_id=</xsl:text>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -113,7 +113,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
<xsl:text>&date=</xsl:text>
<xsl:value-of select="info/date"/>
<xsl:text>&control_id=</xsl:text>
@@ -134,7 +134,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list_for</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -146,7 +146,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -160,7 +160,7 @@
<div id="info_box" style="position:absolute;display:none;"></div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
@@ -179,7 +179,7 @@
<div id="info_box" style="position:absolute;display:none;"></div>
<a class="view_check_list">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -29,7 +29,7 @@
<h3 class="box_header">Sjekklistedetaljer</h3>
<fieldset class="check_list_details">
- <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list"
method="post">
+ <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list.save_check_list"
method="post">
<div id="calendar_dates">
<xsl:for-each select="calendar_array">
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/cases_tab_menu.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -8,7 +8,7 @@
<xsl:attribute
name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_open_cases</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
@@ -20,24 +20,26 @@
<xsl:attribute
name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_closed_cases</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_closed_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Lukkede saker
</a>
+ <!--
<a id="view_measurements">
<xsl:if test="$active_tab = 'view_measurements'">
<xsl:attribute
name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_measurements</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_measurements</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Målinger
</a>
+ -->
</div>
</xsl:template>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -9,7 +9,7 @@
<xsl:attribute
name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
@@ -20,7 +20,7 @@
<xsl:attribute
name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_cases_for_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
@@ -31,7 +31,7 @@
<xsl:attribute
name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
@@ -40,7 +40,7 @@
<div>
<a class="btn focus first">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_case</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -34,7 +34,7 @@
<h3 class="box_header">Sjekklistedetaljer</h3>
<fieldset class="check_list_details">
- <form id="frm_update_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.update_check_list"
method="post">
+ <form id="frm_update_check_list"
action="index.php?menuaction=controller.uicheck_list.update_check_list"
method="post">
<xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
<input id="check_list_id" type="hidden"
name="check_list_id" value="{$check_list_id}" />
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -46,7 +46,7 @@
</form>
</xsl:when>
<xsl:when
test="type = 'control_item_type_2'">
- <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_item&phpgw_return_as=json"
method="post">
+ <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item&phpgw_return_as=json"
method="post">
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
<input
type="hidden" name="control_item_id" value="{$control_item_id}" />
<input
name="status" type="hidden" value="1" />
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -64,7 +64,7 @@
<a style="display:none;" id="view_open_cases">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_open_cases</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -53,7 +53,7 @@
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_lists.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -51,7 +51,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="id"/>
</xsl:attribute>
@@ -81,7 +81,7 @@
</ul>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.control_calendar_status_overview</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control_as_array/id"/>
</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -21,7 +21,7 @@
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><xsl:value-of select="descr"/>
+
<li><xsl:number />. <xsl:value-of select="descr"/>
<xsl:choose>
<xsl:when test="location_item_id > 0">
<div style="float:right;">
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_info.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -76,7 +76,7 @@
<div class="tab_menu">
<a id="view_control_details" class="active">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_details</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_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>
@@ -85,7 +85,7 @@
</a>
<a id="view_control_items">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_items</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_control_items.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -38,7 +38,7 @@
</ul>
<a style="margin-top:20px;" id="print_control_items" class="btn"
target="_blank">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.print_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_measurements.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_measurements.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_measurements.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -18,7 +18,7 @@
<xsl:for-each
select="measurement_check_items">
<li>
<h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
- <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_item"
method="post">
+ <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
<input
type="hidden" name="check_item_id" value="{$check_item_id}" />
<input
type="hidden" name="type" value="control_item_type_2" />
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -18,7 +18,7 @@
<xsl:when
test="cases_array/child::node()">
<li
class="check_item_case">
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
- <ul>
+ <ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
<li><span class="order_nr"><xsl:number /></span>. <xsl:value-of select="descr"/>
@@ -78,7 +78,7 @@
<a style="font-size: 11px;margin-top: 20px;padding: 3px
20px;" class="btn focus">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_case</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/view_control_item_list.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -51,7 +51,7 @@
<div style="margin:20px 0;">
<a
style="text-decoration:underline;font-size:20px;color:#333;">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.save_check_list</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control_as_array/id"/>
</xsl:attribute>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_location/add_location_to_control.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_location/add_location_to_control.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/control_location/add_location_to_control.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -38,13 +38,13 @@
<!-- When control area is chosen, an ajax request is executed.
The operation fetches controls from db and populates the control list.
The ajax opearation is handled in ajax.js -->
<select style="float:left;" id="control_area_list"
name="control_area_list">
- <xsl:for-each select="control_area_array">
- <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$control_area_id}">
- <xsl:value-of select="title"/>
- </option>
+ <option value="">Velg kontrollområde</option>
+ <xsl:for-each select="control_areas_array2">
+ <option value="{id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:for-each>
- </select>
+ </select>
<form id="loc_form" action="" method="GET">
<select id="control_id" name="control_id">
Modified:
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/control_location/view_locations_for_control.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -17,6 +17,7 @@
</func:function>
<xsl:template name="view_locations_for_control">
+
<!-- IMPORTANT!!! Loads YUI javascript -->
<xsl:call-template name="common"/>
@@ -29,13 +30,13 @@
The ajax operation is handled in
ajax.js
-->
<select style="float:left;"
id="control_area_list" name="control_area_list">
- <xsl:for-each
select="control_area_array">
- <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
- <option
value="{$control_area_id}">
- <xsl:value-of
select="title"/>
- </option>
+ <option value="">Velg
kontrollområde</option>
+ <xsl:for-each
select="control_areas_array2">
+ <option value="{id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
</xsl:for-each>
- </select>
+ </select>
<form id="loc_form" action="" method="GET">
Deleted:
branches/Version-1_0-branch/controller/templates/base/tab_view_check_lists_garbage.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/tab_view_check_lists_garbage.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/tab_view_check_lists_garbage.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -1,80 +0,0 @@
-<!-- $Id$ -->
-<xsl:template name="tab_view_check_lists" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <fieldset class="tab_check_list_details">
- <label>Startdato</label>
- <xsl:if test="control_as_array/start_date != ''">
- <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/start_date))"/><br/>
- </xsl:if>
- <label>Sluttdato</label>
- <xsl:if test="control_as_array/end_date != ''">
- <xsl:value-of select="php:function('date',
$date_format, number(control_as_array/end_date))"/><br/>
- </xsl:if>
- <label>Syklustype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
- <label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
- </fieldset>
-
- <ul class="check_list">
- <li class="heading">
- <div class="status">Status</div>
- <div>Skal utføres innen dato</div>
- <div>Planlagt utført dato</div>
- <div>Ble utført dato</div>
- <div>Kommentar</div>
- </li>
- <xsl:choose>
- <xsl:when test="check_list_array/child::node()">
- <xsl:for-each select="check_list_array">
- <li>
- <div
class="order_nr"><xsl:number/>.</div>
- <div class="status">
- <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="status = 1">
- <img
height="15" src="controller/images/status_icon_light_green.png" />
- </xsl:when>
- <xsl:otherwise>
- <img
height="15" src="controller/images/status_icon_red.png" />
- </xsl:otherwise>
- </xsl:choose>
- </div>
- <div>
- <a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
- <xsl:if
test="deadline != ''">
-
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
-
</xsl:if>
- </a>
- </div>
- <div>
- <xsl:if
test="planned_date != ''">
-
<xsl:value-of select="php:function('date', $date_format,
number(planned_date))"/>
- </xsl:if>
- </div>
- <div>
- <xsl:if
test="completed_date != ''">
-
<xsl:value-of select="php:function('date', $date_format,
number(completed_date))"/>
- </xsl:if>
- </div>
- <div><xsl:value-of
select="comment"/></div>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekklister for denne kontrollen
- </xsl:otherwise>
- </xsl:choose>
- </ul>
-</div>
-</xsl:template>
Deleted:
branches/Version-1_0-branch/controller/templates/base/view_check_lists_for_location_garbage.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/view_check_lists_for_location_garbage.xsl
2012-01-30 18:30:07 UTC (rev 8730)
+++
branches/Version-1_0-branch/controller/templates/base/view_check_lists_for_location_garbage.xsl
2012-01-30 18:39:47 UTC (rev 8731)
@@ -1,90 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-
- <h1>Kalenderoversikt</h1>
- <fieldset class="check_list_details">
- <div><xsl:value-of
select="location_array/loc1_name"/></div>
- <div>Periode: <xsl:value-of
select="php:function('date', 'd/m-Y', number(from_date))"/> - <xsl:value-of
select="php:function('date', 'd/m-Y', number(to_date))"/></div>
- </fieldset>
-
- <h2>Sjekklister</h2>
-
- <ul class="calendar">
- <li class="heading">
- <div>Id</div><div
class="title">Tittel</div><div class="date">Startdato</div><div
class="date">Sluttdato</div>
- <div class="frequency">Frekvenstype</div><div
class="frequency">Frekvensintervall</div>
-
<div>Jan</div><div>Feb</div><div>Mar</div><div>Apr</div><div>Mai</div><div>Jun</div>
-
<div>Jul</div><div>Aug</div><div>Sep</div><div>Okt</div><div>Nov</div><div>Des</div>
- </li>
- <xsl:choose>
- <xsl:when
test="controls_calendar_array/child::node()">
- <xsl:for-each
select="controls_calendar_array">
- <li>
- <div>
- <xsl:value-of
select="control/id"/>
- </div>
- <div class="title">
- <xsl:value-of
select="control/title"/>
- </div>
- <div class="date">
- <xsl:value-of
select="php:function('date', 'd/m-Y', number(control/start_date))"/>
- </div>
- <div class="date">
- <xsl:choose>
-
<xsl:when test="control/end_date != 0">
-
<xsl:value-of select="php:function('date', 'd/m-Y', number(control/end_date))"/>
-
</xsl:when>
-
<xsl:otherwise>
-
Løpende
-
</xsl:otherwise>
- </xsl:choose>
- </div>
- <div class="frequency">
- <xsl:value-of
select="control/repeat_type"/>
- </div>
- <div class="frequency">
- <xsl:value-of
select="control/repeat_interval"/>
- </div>
- <xsl:for-each
select="calendar_array">
- <div
style="position:relative;">
- <div
id="info_box" style="position:absolute;display:none;">
- </div>
- <xsl:choose>
-
<xsl:when test="id">
-
<xsl:variable name="status"><xsl:value-of
select="status"/></xsl:variable>
-
<xsl:choose>
-
<xsl:when test="status = 1">
-
<img height="15"
src="controller/images/status_icon_light_green.png" />
-
</xsl:when>
-
<xsl:otherwise>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.get_check_list_info</xsl:text>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<img height="15"
src="controller/images/status_icon_red.png" />
-
</a>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:when>
-
<xsl:otherwise>
-
<img height="15" src="controller/images/status_icon_yellow.png" />
-
</xsl:otherwise>
-
</xsl:choose>
- </div>
- </xsl:for-each>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekklister for denne kontrollen
- </xsl:otherwise>
- </xsl:choose>
- </ul>
-</div>
-</xsl:template>
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8731] Merge 8692:8730 from trunk,
Sigurd Nes <=