[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9161] Merge 9120:9160 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9161] Merge 9120:9160 from trunk |
|
Date: |
Tue, 17 Apr 2012 06:30:57 +0000 |
Revision: 9161
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9161
Author: sigurdne
Date: 2012-04-17 06:30:55 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Merge 9120:9160 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
branches/Version-1_0-branch/booking/inc/class.uisettings.inc.php
branches/Version-1_0-branch/booking/setup/default_records.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/templates/base/settings.xsl
branches/Version-1_0-branch/controller/images/bg_expand_active.png
branches/Version-1_0-branch/controller/images/bg_expand_not_active.png
branches/Version-1_0-branch/controller/images/bg_expand_not_active.psd
branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.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/component/class.calendar_builder.inc.php
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
branches/Version-1_0-branch/controller/inc/helper/class.status_checker.inc.php
branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
branches/Version-1_0-branch/controller/js/controller/custom_ui.js
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/setup/tables_update.inc.php
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/case/create_case_message.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/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_check_list.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_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/choose_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soXport.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/inc/import/default/Import_fra_BKK
branches/Version-1_0-branch/property/inc/import/default/Import_fra_BKK_csv
branches/Version-1_0-branch/property/inc/import/default/efaktura_dnb_xml
branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
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/invoice2.xsl
branches/Version-1_0-branch/registration/inc/class.bomanagefields.inc.php
branches/Version-1_0-branch/registration/inc/class.boreg.inc.php
branches/Version-1_0-branch/registration/inc/class.soreg.inc.php
branches/Version-1_0-branch/registration/inc/class.uimanagefields.inc.php
branches/Version-1_0-branch/registration/inc/class.uireg.inc.php
branches/Version-1_0-branch/registration/main.php
branches/Version-1_0-branch/registration/setup/phpgw_no.lang
branches/Version-1_0-branch/registration/templates/base/fields.tpl
branches/Version-1_0-branch/registration/templates/base/personal_info.tpl
Added Paths:
-----------
branches/Version-1_0-branch/controller/images/bg_expand_active_light_blue.png
branches/Version-1_0-branch/controller/images/bg_expand_active_light_blue.psd
branches/Version-1_0-branch/registration/js/portico/
Removed Paths:
-------------
branches/Version-1_0-branch/controller/js/controller/jquery-ui.custom.min_bac.js
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,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119
+
/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,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -223,10 +223,12 @@
if(isset($g_id) && $g_id > 0)
{
+
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
true));
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),$subject,$body);
}
else if (isset($o_id) && $o_id
> 0)
{
+
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),$subject,$body);
}
}
@@ -418,7 +420,8 @@
{
//$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
$subject = lang('mail_subject_update');
- $link_text = "<a
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
+ //$link_text = "<a
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
+ $link_text = "<a
href='http://www.bergen.kommune.no/aktivitetsoversikt/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());
if($activity->get_state() == 2)
{
@@ -459,7 +462,8 @@
{
//$subject = lang('mail_subject_update', $avtivity->get_id() .
'-' . $activity->get_title(), $activity->get_link());
$subject = lang('mail_subject_update');
- $link_text =
"http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ //$link_text =
"http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ $link_text =
"http://www.bergen.kommune.no/aktivitetsoversikt/registreringsskjema/endre/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
$office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
$body = lang('mail_body_update', $activity->get_title(),
$link_text, $office_name);
}
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -154,7 +154,7 @@
$contact1 = array();
$contact1['name'] =
phpgw::get_var('org_contact1_name');
$contact1['phone'] =
phpgw::get_var('org_contact1_phone');
- $contact1['mail'] =
phpgw::get_var('org_contact1_email');
+ $contact1['mail'] =
phpgw::get_var('org_contact1_mail');
$contact1['org_id'] = $o_id;
$contact1['group_id'] = 0;
$this->so_activity->add_contact_person_local($contact1);
@@ -162,7 +162,7 @@
$contact2 = array();
$contact2['name'] =
phpgw::get_var('org_contact2_name');
$contact2['phone'] =
phpgw::get_var('org_contact2_phone');
- $contact2['mail'] =
phpgw::get_var('org_contact2_email');
+ $contact2['mail'] =
phpgw::get_var('org_contact2_mail');
$contact2['org_id'] = $o_id;
$contact2['group_id'] = 0;
$this->so_activity->add_contact_person_local($contact2);
@@ -196,7 +196,7 @@
$contact1 = array();
$contact1['name'] =
phpgw::get_var('group_contact1_name');
$contact1['phone'] =
phpgw::get_var('group_contact1_phone');
- $contact1['mail'] =
phpgw::get_var('group_contact1_email');
+ $contact1['mail'] =
phpgw::get_var('group_contact1_mail');
$contact1['org_id'] = 0;
$contact1['group_id'] = $g_id;
$this->so_activity->add_contact_person_local($contact1);
@@ -204,7 +204,7 @@
$contact2 = array();
$contact2['name'] =
phpgw::get_var('group_contact2_name');
$contact2['phone'] =
phpgw::get_var('group_contact2_phone');
- $contact2['mail'] =
phpgw::get_var('group_contact2_email');
+ $contact2['mail'] =
phpgw::get_var('group_contact2_mail');
$contact2['org_id'] = 0;
$contact2['group_id'] = $g_id;
$this->so_activity->add_contact_person_local($contact2);
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -13,11 +13,11 @@
var div_select = document.getElementById('group_select');
<?php if($activity->get_group_id()){?>
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
if(org_id != null && org_id == 'new_org')
@@ -81,8 +81,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -104,8 +104,8 @@
var address = document.getElementById('contact2_address_txt').value;
var div_address = document.getElementById('contact2_address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -17,8 +17,8 @@
var org_id = document.getElementById('organization_id').value;
var div_select = document.getElementById('activity_select');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
var divcontent_start = "<select name=\"activity_id\" id=\"activity_id\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -38,8 +38,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -61,8 +61,8 @@
var address = document.getElementById('arena_address_txt').value;
var div_address = document.getElementById('arena_address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"arena_address\" id=\"arena_address\"
size\"5\">";
var divcontent_end = "</select>";
@@ -84,8 +84,8 @@
var address = document.getElementById('contact2_address_txt').value;
var div_address = document.getElementById('contact2_address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"contact2_address\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -9,8 +9,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_reciept.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -9,8 +9,8 @@
var address = document.getElementById('address_txt').value;
var div_address = document.getElementById('address_container');
- url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- //url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
Modified: branches/Version-1_0-branch/booking/inc/class.uisettings.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uisettings.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/booking/inc/class.uisettings.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -1,5 +1,6 @@
<?php
phpgw::import_class('booking.uicommon');
+ phpgw::import_class('booking.uicommon');
class booking_uisettings extends booking_uicommon
{
@@ -19,9 +20,13 @@
$config = CreateObject('phpgwapi.config','booking');
$config->read();
+ // Define internal and external billing sequence number
values
+ $internal_value = null;
+ $external_value = null;
+
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- foreach($_POST as $dim => $value)
+ foreach($_POST['config_data'] as $dim => $value)
{
if (strlen(trim($value)) > 0)
{
@@ -33,8 +38,31 @@
}
}
$config->save_repository();
+
+ // Save internal and external sequential
numbers to database
+ if( isset( $_POST['billing'] ) ) {
+ $internal_value = intval(
$_POST['billing']['internal'] );
+ $external_value = intval(
$_POST['billing']['external'] );
+ $GLOBALS['phpgw']->db->query( "UPDATE
bb_billing_sequential_number_generator SET value=" . $internal_value . " WHERE
name='internal'" );
+ $GLOBALS['phpgw']->db->query( "UPDATE
bb_billing_sequential_number_generator SET value=" . $external_value . " WHERE
name='external'" );
+ }
}
-
- self::render_template('settings', array('config_data'
=>$config->config_data));
+
+ // Load internal and external sequential numbers from
database (if not already set) and insert into $billing
+ if( is_null( $internal_value ) || is_null(
$external_value ) ) {
+ $db = $GLOBALS['phpgw']->db;
+ $db->query( "SELECT name, value FROM
bb_billing_sequential_number_generator WHERE name='internal' OR name='external'
LIMIT 2" );
+ while( $db->next_record() ) {
+ if( !strcmp( $db->f( 'name', false ),
"internal" ) ) {
+ $internal_value = intval(
$db->f( 'value', false ) );
+ } else if( !strcmp( $db->f( 'name',
false ), "external" ) ) {
+ $external_value = intval(
$db->f( 'value', false ) );
+ }
+ }
+ }
+ $billing = array( 'internal' => $internal_value,
+ 'external' => $external_value );
+
+ self::render_template('settings', array('config_data'
=>$config->config_data, 'billing' => $billing ) );
}
}
Modified: branches/Version-1_0-branch/booking/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/default_records.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/booking/setup/default_records.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -22,3 +22,7 @@
default:
//do nothing for now
}
+
+ // Insert start values for billing sequential numbers
+ $oProc->query( "INSERT INTO bb_billing_sequential_number_generator (
name, value ) VALUES ( 'internal', 1 ), ( 'external', 1 )" );
+
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2012-04-16
17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2012-04-17
06:30:55 UTC (rev 9161)
@@ -544,4 +544,8 @@
There is a cost of %1 assosiated with the allocation you are useing booking
no Det er en kostnad på %1kr knyttet til den tildelingen du bruker.
Export booking no Eksport
Upload booking no Last opp
-Get all contact and invoice information from organization booking no
Hent all kontakt/faktura informasjon fra Organisasjon
+Get all contact and invoice information from organization booking no
Hent all kontakt/faktura informasjon fra Organisasjon
+Current internal billing sequence number booking no Nåværende
sekvensnummer for intern fakturering
+Current external billing sequence number booking no Nåværende
sekvensnummer for ekstern fakturering
+Billing sequence numbers booking no Sekvensnummer for fakturering
+Do not change these values unless you know what they are. booking no
Ikke endre disse verdiene med mindre du vet hva de er.
Modified: branches/Version-1_0-branch/booking/templates/base/settings.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/settings.xsl
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/booking/templates/base/settings.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -10,10 +10,10 @@
<form action="" method="POST">
- <dl class="form-col">
+ <dl class="form">
<dt><label for="field_user_can_delete"><xsl:value-of
select="php:function('lang', 'Frontend users can delete bookings and
allocations')"/></label></dt>
<dd>
- <select id="field_user_can_delete"
name="user_can_delete">
+ <select id="field_user_can_delete"
name="config_data[user_can_delete]">
<option value="no">
<xsl:if test="config_data/user_can_delete='no'">
<xsl:attribute
name="selected">checked</xsl:attribute>
@@ -28,7 +28,24 @@
</option>
</select>
</dd>
- </dl>
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Billing sequence numbers')"/></dt>
+ <dd>
+ <xsl:value-of select="php:function('lang', 'Do
not change these values unless you know what they are.')"/>
+ </dd>
+ <dt><label
for="field_internal_billing_sequence_number"><xsl:value-of
select="php:function('lang', 'Current internal billing sequence number')"
/></label></dt>
+ <dd>
+ <input type="number" name="billing[internal]">
+ <xsl:attribute
name="value"><xsl:value-of select="billing/internal"/></xsl:attribute>
+ </input>
+ </dd>
+
+ <dt><label
for="field_external_billing_sequence_number"><xsl:value-of
select="php:function('lang', 'Current external billing sequence number')"
/></label></dt>
+ <dd>
+ <input type="number" name="billing[external]">
+ <xsl:attribute
name="value"><xsl:value-of select="billing/external"/></xsl:attribute>
+ </input>
+ </dd>
+ </dl>
<div class="form-buttons">
<input type="submit">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
Modified: branches/Version-1_0-branch/controller/images/bg_expand_active.png
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/bg_expand_active_light_blue.png
(from rev 9160, trunk/controller/images/bg_expand_active_light_blue.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/bg_expand_active_light_blue.psd
(from rev 9160, trunk/controller/images/bg_expand_active_light_blue.psd)
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/controller/images/bg_expand_not_active.png
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/controller/images/bg_expand_not_active.psd
===================================================================
(Binary files differ)
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-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -316,6 +316,8 @@
$sql .= "AND cic.location_item_id IS NULL ";
else if($messageStatus != null & $messageStatus ==
'message_registered')
$sql .= "AND cic.location_item_id > 0 ";
+
+ $sql .= "ORDER BY ci.id";
$this->db->query($sql);
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -189,7 +189,7 @@
return $results;
}
- function get_control_items_by_control_and_group($control_id,
$control_group_id)
+ function get_control_items_by_control_and_group($control_id,
$control_group_id, $returnType = "return_array")
{
$results = array();
@@ -210,9 +210,12 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
//$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
+
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
- $results[] = $control_item->toArray();
+ if($returnType == "return_array")
+ $results[] = $control_item->toArray();
+ else
+ $results[] = $control_item;
}
return $results;
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -122,6 +122,9 @@
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $control_with_check_list_array,
$num_days_in_month, "view_days" );
+ //print_r($controls_calendar_array);
+
+
foreach($controls_calendar_array as &$inst)
{
$curr_control = &$inst['control'];
@@ -202,7 +205,7 @@
// Creates a calendar object for time period
$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
- // Loops through controls with repeat type: day or week
in controls_for_location_array
+ // Loops through controls with repeat type: day or week
in controls_for_location_array
// and populates array that contains aggregate open
cases pr month.
foreach($controls_for_location_array as $control){
if($control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1){
@@ -233,7 +236,7 @@
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
- print_r($controls_calendar_array);
+
$data = array
(
'my_locations' =>
$my_locations,
@@ -245,9 +248,8 @@
'period' =>
$year,
'year' =>
$year
);
- print_r( $controls_calendar_array );
+
self::render_template_xsl('calendar/view_calendar_year', $data);
-
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
}
@@ -354,14 +356,14 @@
// Generates array of aggregated number of open cases for each
month in time period
function build_agg_open_cases_pr_month_array($control,
$location_code, $year){
- // Checks if control starts in the year that will be
shown
+ // Checks if control starts in the year that is
displayed
if( date("Y", $control->get_start_date()) == $year ){
$from_month = date("n",
$control->get_start_date());
}else{
$from_month = 1;
}
- // Checks if control ends in the year that will be shown
+ // Checks if control ends in the year that is displayed
if( date("Y", $control->get_end_date()) == $year ){
$to_month = date("n", $control->get_end_date());
}else{
@@ -372,24 +374,31 @@
// Fetches aggregate value for open cases in each month
in time period
for($from_month;$from_month<=$to_month;$from_month++){
-
- $trail_from_date_ts =
strtotime("$from_month/01/$year");
- $trail_to_date_ts =
strtotime("$to_month/01/$year");
-
+
+ $month_start_ts =
strtotime("$from_month/01/$year");
+ $end_month = $from_month + 1;
+
+ if($end_month > 12){
+ $year = $year + 1;
+ $end_month = 1;
+ }
+
+ $month_end_ts =
strtotime("$end_month/01/$year");
+
$num_open_cases_for_control_array = array();
// Fetches aggregate value for open cases in a
month from db
- $num_open_cases_for_control_array =
$this->so_check_list->get_num_open_cases_for_control( $control->get_id(),
$location_code, $trail_from_date_ts, $trail_to_date_ts );
-
+ $num_open_cases_for_control_array =
$this->so_check_list->get_num_open_cases_for_control( $control->get_id(),
$location_code, $month_start_ts, $month_end_ts );
+
// If there is a aggregated value for the
month, add aggregated status object to agg_open_cases_pr_month_array
if( !empty($num_open_cases_for_control_array) ){
$status_agg_month_info = new
status_agg_month_info();
-
$status_agg_month_info->set_month_nr(date("n", $from_month));
+
$status_agg_month_info->set_month_nr($from_month);
$status_agg_month_info->set_agg_open_cases(
$num_open_cases_for_control_array["count"] );
$agg_open_cases_pr_month_array[] =
$status_agg_month_info;
}
}
-
+
return $agg_open_cases_pr_month_array;
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -55,7 +55,8 @@
'register_measurement_case' => true,
'updateStatusForCases' => true,
'delete_case' => true,
-
'close_case' => true
+
'close_case' => true,
+
'open_case' => true
);
function __construct()
@@ -414,7 +415,7 @@
$check_list_id = phpgw::get_var('check_list_id');
$case = $this->so->get_single($case_id);
- $case->set_status(1);
+
$case->set_status(controller_check_item_case::STATUS_CLOSED);
$case_id = $this->so->store($case);
@@ -422,11 +423,31 @@
$status_checker = new status_checker();
$status_checker->update_check_list_status(
$check_list_id );
- return json_encode( array( "status" => "closed"
) );
+ return json_encode( array( "status" => "true" )
);
}
else
- return json_encode( array( "status" =>
"not_closed" ) );
+ return json_encode( array( "status" => "false"
) );
}
+ public function open_case()
+ {
+ $case_id = phpgw::get_var('case_id');
+ $check_list_id = phpgw::get_var('check_list_id');
+
+ $case = $this->so->get_single($case_id);
+
$case->set_status(controller_check_item_case::STATUS_OPEN);
+
+ $case_id = $this->so->store($case);
+
+ if($case_id > 0){
+ $status_checker = new status_checker();
+ $status_checker->update_check_list_status(
$check_list_id );
+
+ return json_encode( array( "status" => "true" )
);
+ }
+ else
+ return json_encode( array( "status" => "false"
) );
+ }
+
public function query(){}
}
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-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -246,6 +246,46 @@
}
/**
+ * Public function for saving a check list
+ *
+ * @param HTTP:: location code, control id, status etc.. (check
list details)
+ * @return data array
+ */
+ 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.edit_check_list', 'check_list_id'=>$check_list_id));
+ }
+
+ /**
* Public function for displaying the edit check list form
*
* @param HTTP:: check list id
@@ -319,45 +359,7 @@
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
- /**
- * Public function for saving a check list
- *
- * @param HTTP:: location code, control id, status etc.. (check
list details)
- * @return data array
- */
- 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.edit_check_list', 'check_list_id'=>$check_list_id));
- }
+
/**
* Public function for displaying the create message form
@@ -450,6 +452,7 @@
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
+ // Saves a check list that already exists. Returns status for
update as a JSON array with values update/not updated
public function update_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
$status = (int)phpgw::get_var('status');
@@ -548,37 +551,39 @@
self::render_template_xsl('check_list/view_control_details', $data);
}
- // Function that displays control items
+ // Function that displays control groups and control items for
a check list
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());
-
- $control_items_for_check_list = array();
- $remove_control_item_ids_array = array();
+ $control =
$this->so_control->get_single($check_list->get_control_id());
- // Fetches all control items for a check list
- $control_items =
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
+ $saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
+
+ $control_groups_with_items_array = array();
- // Fetches all check items for a check list as objects
- $check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
-
- // Puts closed check items of type measurement into
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();
- }
+ //Populating array with saved control items for each
group
+ foreach ($saved_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());
+
+ if(count($saved_control_items) > 0)
+ $control_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
+ /* ================ Ikke slett!!! Kode som henter ut
utstyr basert på lokasjon ==================
+
//get control items based on control group/component
connection
$control_groups_for_control =
$this->so_control_group->get_control_group_ids_for_control($control->get_id());
//_debug_array($control_groups_for_control);
+
foreach($control_groups_for_control as $cg)
{
$components_for_control_group[] = array($cg =>
$this->so_control_group->get_components_for_control_group($cg));
}
+
//_debug_array($components_for_control_group);
+
$control_group_check_items = array();
foreach($components_for_control_group as $cg_components)
{
@@ -603,23 +608,17 @@
}
}
}
+
=====================================================================*/
//_debug_array($control_group_check_items);
-
- // Makes control items list stripped for closed check
items of type measurement
- 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,
+ 'control'
=> $control->toArray(),
+ 'check_list'
=> $check_list->toArray(),
+ 'location_array'
=> $location_array,
+ 'control_groups_with_items_array' =>
$control_groups_with_items_array
);
self::add_javascript('controller', 'controller',
'jquery.js');
@@ -652,12 +651,17 @@
$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, null,
'closed', null, 'return_array');
-
+ $closed_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id,
"control_item_type_1", 'closed', null, 'return_array');
+ $closed_check_items_and_measurements =
$this->so_check_item->get_check_items_with_cases($check_list_id,
"control_item_type_2", 'closed', null, 'return_array');
+
+ //echo "SKRIVER UT LUKKEDE SAKER";
+ //print_r($closed_check_items_and_cases);
+
$data = array
(
- 'closed_check_items_and_cases' =>
$closed_check_items_and_cases,
- 'check_list'
=> $check_list->toArray()
+ 'closed_check_items_and_cases'
=> $closed_check_items_and_cases,
+ 'closed_check_items_and_measurements' =>
$closed_check_items_and_measurements,
+ 'check_list'
=> $check_list->toArray()
);
self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_closed_cases'), $data );
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -492,41 +492,47 @@
*
* @param HTTP::id the control_id
* @return redirect to function view_control_items
- */
+ */
public function view_control_items(){
$control_id = phpgw::get_var('control_id', 'int');
$control = $this->so->get_single($control_id);
- // Fetches saved control items from db
- $saved_control_items =
$this->so_control_item_list->get_control_items_by_control($control_id);
- $saved_control_item_ids = array();
-
- foreach($saved_control_items as $control_item){
- $saved_control_item_ids[] =
$control_item->get_id();
- }
-
// Array with selected control groups and items
$groups_with_control_items = array();
$saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
-
+
// Fetches control items for control group and
populates groups_with_control_items with groups and chosen control items
foreach ($saved_control_groups as $control_group)
{
- $group_control_items_array =
$this->so_control_item_list->get_control_items($control_group->get_id(),
"return_array");
+ // Fetches control items for group
+ $control_items_for_group =
$this->so_control_item_list->get_control_items($control_group->get_id());
+ // Fetches saved, ordered control items for
group
+ $saved_control_items_for_group =
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
$control_group->get_id(), "return_object");
+
+ // Array that contains saved and unsaved
control items for the group
$control_items_for_group_array = array();
- foreach($group_control_items_array as
$control_item){
- $control_item_id = $control_item['id'];
+ foreach($saved_control_items_for_group as
$saved_control_item){
+ $control_items_for_group_array[] =
array("checked" => 1, "control_item" => $saved_control_item->toArray());
+ }
+
+ // Loops through all control items for the
group and add those control items that is not saved
+ foreach($control_items_for_group as
$control_item){
+ $status_control_item_saved = false;
- if( in_array($control_item_id,
$saved_control_item_ids )){
-
$control_items_for_group_array[] = array("checked" => 1, "control_item" =>
$control_item);
+ foreach($saved_control_items_for_group
as $saved_control_item){
+ if( $control_item->get_id() ==
$saved_control_item->get_id()){
+
$status_control_item_saved = true;
+ }
}
- else
- {
-
$control_items_for_group_array[] = array("checked" => 0, "control_item" =>
$control_item);
+
+ // Adds control item to saved
+ if(!$status_control_item_saved){
+
$control_items_for_group_array[] = array("checked" => 0, "control_item" =>
$control_item->toArray());
}
+
}
$groups_with_control_items[] =
array("control_group" => $control_group->toArray(), "group_control_items" =>
$control_items_for_group_array);
@@ -595,13 +601,15 @@
$control_id = phpgw::get_var('control_id');
$control = $this->so->get_single($control_id);
+ // Fetches saved control groups from DB for this
control
$saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
$saved_groups_with_items_array = array();
- //Populating array with saved control items for each
group
+ // Populating array with saved control items for each
group
foreach ($saved_control_groups as $control_group)
{
+ // Fetches saved control items for group
$saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
$control_group->get_id());
if(count($saved_control_items) > 0)
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -37,7 +37,7 @@
if($date < $todays_date){
$status = "control_not_accomplished";
}else{
- $status = "control_registered";
+ $status = "CONTROL_REGISTERED";
}
if( $period_type == "view_months" )
@@ -55,13 +55,16 @@
return $calendar_array;
}
+ // Function that puts checklists into a twelve months array for
displaying a year or a days array for displaying a month
public function build_calendar_array( $controls_with_check_lists_array,
$num, $period_type ){
foreach($controls_with_check_lists_array as $control){
+
+ // ======================== DISPLAY STATUS FOR A MONTH
OR DAYS IN A MONTH ==========================
if($period_type == "view_days" | ($period_type ==
"view_months" & $control->get_repeat_type() == 2 | $control->get_repeat_type()
== 3))
{
$calendar_array = $this->init_calendar(
$control, $num, $period_type );
-
+
foreach($control->get_check_lists_array() as
$check_list)
{
$check_list_status_manager = new
check_list_status_manager( $check_list );
@@ -82,10 +85,14 @@
$controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
}
+ // ======================== DISPLAY AGGREGATE STATUS
FOR A MONTH ==========================
else if($period_type == "view_months" &
($control->get_repeat_type() == 0 | $control->get_repeat_type() == 1))
{
$calendar_array = array();
+ for($i=1;$i<=12;$i++)
+ $calendar_array[$i] = "";
+
foreach($control->get_agg_open_cases_pr_month_array() as $status_agg_month_info)
{
$status =
"controls_accomplished_with_errors";
Modified:
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/inc/helper/class.check_list_status_manager.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -44,28 +44,29 @@
$check_list_status_info->set_check_list_id(
$this->check_list->get_id() );
$todays_date_ts = mktime(0,0,0,date("m"), date("d"),
date("Y"));
-
- if( $this->check_list->get_status() ==
controller_check_list::STATUS_OPEN & $this->check_list->get_planned_date() > 0
& $this->check_list->get_deadline() > $todays_date_ts)
+
+ // Control PLANNED - the checklist has a planned date
+ if( $this->check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_planned_date()
> 0 & $this->check_list->get_deadline() >= $todays_date_ts)
{
- $status = "control_planned";
+ $status = "CONTROL_PLANNED";
}
- else if( $this->check_list->get_status() ==
controller_check_list::STATUS_OPEN & $this->check_list->get_planned_date() > 0
& $this->check_list->get_deadline() < $todays_date_ts )
+ else if( $this->check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_planned_date()
> 0 & $this->check_list->get_deadline() < $todays_date_ts )
{
- $status = "control_not_accomplished_with_info";
+ $status = "CONTROL_NOT_DONE_WITH_PLANNED_DATE";
}
- else if( $this->check_list->get_status() ==
controller_check_list::STATUS_OPEN & $this->check_list->get_deadline() <
$todays_date_ts )
+ else if( $this->check_list->get_status() ==
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_deadline() <
$todays_date_ts )
{
$status = "control_not_accomplished";
}
- else if( $this->check_list->get_status() ==
controller_check_list::STATUS_CLOSED & $this->check_list->get_completed_date()
> $this->check_list->get_deadline() & $this->check_list->get_num_open_cases()
== 0)
+ else if( $this->check_list->get_status() ==
controller_check_list::STATUS_DONE & $this->check_list->get_completed_date() >
$this->check_list->get_deadline() & $this->check_list->get_num_open_cases() ==
0)
{
- $status =
"control_accomplished_over_time_without_errors";
+ $status =
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS";
}
- else if( $this->check_list->get_status() ==
controller_check_list::STATUS_CLOSED & $this->check_list->get_completed_date()
< $this->check_list->get_deadline() & $this->check_list->get_num_open_cases()
== 0)
+ else if( $this->check_list->get_status() ==
controller_check_list::STATUS_DONE & $this->check_list->get_completed_date() <
$this->check_list->get_deadline() & $this->check_list->get_num_open_cases() ==
0)
{
- $status =
"control_accomplished_in_time_without_errors";
+ $status = "CONTROL_DONE_IN_TIME_WITHOUT_ERRORS";
}
- else if( $this->check_list->get_status() ==
controller_check_list::STATUS_CLOSED & $this->check_list->get_num_open_cases()
> 0){
+ else if( $this->check_list->get_status() ==
controller_check_list::STATUS_DONE & $this->check_list->get_num_open_cases() >
0){
$status = "control_accomplished_with_errors";
$check_list_status_info->set_num_open_cases($this->check_list->get_num_open_cases());
}
Modified:
branches/Version-1_0-branch/controller/inc/helper/class.status_checker.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/helper/class.status_checker.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/inc/helper/class.status_checker.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -18,7 +18,7 @@
$check_list = $this->so_check_list->get_single(
$check_list_id );
$check_items =
$this->so_check_item->get_check_items_with_cases($check_list_id,
$control_item_type = null, $status = null, $messageStatus = null,
"return_object");
-
+
$num_open_cases = 0;
$num_pending_cases = 0;
@@ -36,12 +36,12 @@
}
}
+ if($num_open_cases > 0)
+
$check_list->set_status(controller_check_list::STATUS_DONE);
+
$check_list->set_num_open_cases($num_open_cases);
$check_list->set_num_pending_cases($num_pending_cases);
- if($num_open_cases > 0)
-
$check_list->set_status(controller_check_list::STATUS_OPEN);
-
$this->so_check_list->store($check_list);
}
}
\ No newline at end of file
Modified:
branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -33,9 +33,9 @@
class controller_check_list extends controller_model
{
public static $so;
-
- const STATUS_OPEN = 0;
- const STATUS_CLOSED = 1;
+
+ const STATUS_NOT_DONE = 0;
+ const STATUS_DONE = 1;
const STATUS_CANCELED = 3;
protected $id;
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-04-17 06:30:55 UTC (rev 9161)
@@ -25,8 +25,7 @@
window.location.href = requestUrl;
});
- //update location category based on location type
- //file:
+ // Update location category based on location type
$("#type_id").change(function () {
var location_type_id = $(this).val();
var oArgs =
{menuaction:'controller.uicontrol_location.get_location_category'};
@@ -293,44 +292,6 @@
});
});
- // file: sort_check_list.xsl
- // Saves order of control items for a group
- /*
- * ERSTATTET AV FUNKSJONALITET SOM SORTERER GRUPPER OG ITEMS
- *
- $(".frm_save_order").submit(function(e){
- e.preventDefault();
- var thisForm = $(this);
-
- var control_id = $("#control_id").val();
- var control_group_id =
$(this).find("input[name='control_group_id']").val();
- var order_nr_array;
- var requestUrl = $(thisForm).attr("action");
-
- $(this).find("input[name='order_tags[]']").each(function() {
- order_nr_array += $(this).val() + ",";
- });
-
- $.ajax({
- type: 'POST',
- url: requestUrl + "&control_id=" + control_id + "&" +
$(this).serialize(),
- success: function() {
-
- // Changes text on save button
- var this_submit_btn =
$(thisForm).find("input[type='submit']");
- $(this_submit_btn).val("Lagret");
-
- // Changes text on save button back to
original
- window.setTimeout(function() {
- $(this_submit_btn).val('Lagre
rekkefølge');
- }, 1000);
-
- $(this_submit_btn).css({opacity: 0.5 });
- $(this_submit_btn).attr('disabled',
'disabled');
- }
- });
- });
- */
$("#frm_save_control_groups").submit(function(e){
var thisForm = $(this);
var num_checked = $(this).find("input:checked").length;
@@ -366,6 +327,7 @@
$(this).addClass("focus");
});
+ // ================= SAVE CONTROL DETAILS - FORM SUBMIT
==================
$("#frm_save_control_details").submit(function(e){
var thisForm = $(this);
@@ -408,7 +370,6 @@
});
- // file: view_check_lists_for_location.xsl
// Fetches info about a check list on hover status image icon
$('a.view_check_list').bind('contextmenu', function(){
var thisA = $(this);
@@ -514,6 +475,9 @@
});
});
+ //=========================== CHECKLIST
================================
+
+ // UPDATE CHECKLIST DETAILS
$("#frm_update_check_list").live("submit", function(e){
e.preventDefault();
@@ -521,28 +485,77 @@
var submitBnt = $(thisForm).find("input[type='submit']");
var requestUrl = $(thisForm).attr("action");
- $.ajax({
- type: 'POST',
- url: requestUrl + "&phpgw_return_as=json&" +
$(thisForm).serialize(),
- success: function(data) {
- if(data){
- var obj = jQuery.parseJSON(data);
-
- if(obj.status == "updated"){
- var submitBnt =
$(thisForm).find("input[type='submit']");
- $(submitBnt).val("Lagret");
-
- // Changes text on save button back
to original
- window.setTimeout(function() {
- $(submitBnt).val('Lagre
sjekkpunkt');
-
$(submitBnt).addClass("not_active");
- }, 1000);
+ var statusFieldVal = $("#status").val();
+ var completedDateVal = $("#completed_date").val();
+ var completedDateRow = $("#completed_date").closest(".row");
+
+ // Checks that COMPLETE DATE is set if status is set to DONE
+ if(statusFieldVal == 1 & completedDateVal == ''){
+ // Displays error message above completed date
+ $(completedDateRow).before("<div
class='input_error_msg'>Vennligst angi når kontrollen ble utført</div>");
+ }else{
+
+ $(".input_error_msg").hide();
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl + "&phpgw_return_as=json&" +
$(thisForm).serialize(),
+ success: function(data) {
+ if(data){
+ var obj = jQuery.parseJSON(data);
+
+ if(obj.status == "updated"){
+ var submitBnt =
$(thisForm).find("input[type='submit']");
+ $(submitBnt).val("Lagret");
+
+ // Changes text on save
button back to original
+ window.setTimeout(function() {
+
$(submitBnt).val('Lagre sjekkpunkt');
+
$(submitBnt).addClass("not_active");
+ }, 1000);
+ }
}
- }
- }
- });
+ }
+ });
+ }
});
+ // Display submit button on click
+ $("#frm_update_check_list").live("click", function(e){
+ var thisForm = $(this);
+ var submitBnt = $(thisForm).find("input[type='submit']");
+ $(submitBnt).removeClass("not_active");
+ });
+
+ //============================= ADD CHECKLIST
===========================
+
+ // ADD CHECKLIST
+ $("#frm_add_check_list").live("submit", function(e){
+
+ var thisForm = $(this);
+ var statusFieldVal = $("#status").val();
+ var completedDateVal = $("#completed_date").val();
+ var completedDateRow = $("#completed_date").closest(".row");
+
+ // Checks that COMPLETE DATE is set if status is set to DONE
+ if(statusFieldVal == 1 & completedDateVal == ''){
+ e.preventDefault();
+ // Displays error message above completed date
+ $(completedDateRow).before("<div
class='input_error_msg'>Vennligst angi når kontrollen ble utført</div>");
+ }
+ });
+
+ // Display submit button on click
+ $("#frm_add_check_list").live("click", function(e){
+ var thisForm = $(this);
+ var submitBnt = $(thisForm).find("input[type='submit']");
+ $(submitBnt).removeClass("not_active");
+ });
+
+
+ //============================= CASE ===========================
+
+ // REGISTER CASE
$(".frm_register_case").live("submit", function(e){
e.preventDefault();
@@ -573,7 +586,8 @@
}
});
});
-
+
+ // UPDATE CASE
$(".frm_update_case").live("submit", function(e){
e.preventDefault();
@@ -595,6 +609,10 @@
if(type == "control_item_type_1"){
}else if(type == "control_item_type_2"){
+ var case_status =
$(thisForm).find("select[name='case_status'] option:selected").text();
+
+ $(clickRow).find(".case_info
.case_status").empty().text( case_status );
+
var measurement_text =
$(thisForm).find("input[name='measurement']").val();
$(clickRow).find(".case_info
.measurement").text(measurement_text);
}
@@ -675,7 +693,7 @@
});
// Closes a case
- $(".close_case").live("click", function(){
+ $("a.close_case").live("click", function(){
var clickElem = $(this);
var clickRow = $(this).closest("li");
var clickItem = $(this).closest("ul");
@@ -690,7 +708,7 @@
success: function(data) {
var obj = jQuery.parseJSON(data);
- if(obj.status == "closed"){
+ if(obj.status == "true"){
if( $(clickItem).children("li").length
> 1){
$(clickRow).fadeOut(300,
function(){
$(clickRow).remove();
@@ -715,16 +733,45 @@
return false;
});
- $("#frm_update_check_list").live("click", function(e){
- var thisForm = $(this);
- var submitBnt = $(thisForm).find("input[type='submit']");
- $(submitBnt).removeClass("not_active");
- });
+ // Open case
+ $("a.open_case").live("click", function(){
+ var clickElem = $(this);
+ var clickRow = $(this).closest("li");
+ var clickItem = $(this).closest("ul");
+ var checkItemRow = $(this).parents("li.check_item_case");
+
+ var url = $(clickElem).attr("href");
- $("#frm_add_check_list").live("click", function(e){
- var thisForm = $(this);
- var submitBnt = $(thisForm).find("input[type='submit']");
- $(submitBnt).removeClass("not_active");
+ // Sending request for deleting a control item list
+ $.ajax({
+ type: 'POST',
+ url: url,
+ success: function(data) {
+ var obj = jQuery.parseJSON(data);
+
+ if(obj.status == "true"){
+ if( $(clickItem).children("li").length
> 1){
+ $(clickRow).fadeOut(300,
function(){
+ $(clickRow).remove();
+ });
+
+ var next_row =
$(clickRow).next();
+
+ // Updating order numbers for
rows below deleted row
+ while( $(next_row).length > 0){
+
update_order_nr_for_row(next_row, "-");
+ next_row =
$(next_row).next();
+ }
+ }else{
+ $(checkItemRow).fadeOut(300,
function(){
+
$(checkItemRow).remove();
+ });
+ }
+ }
+ }
+ });
+
+ return false;
});
$(".frm_save_check_item").live("click", function(e){
@@ -759,6 +806,24 @@
$(wrpElem).find(".help_text").fadeOut(300);
});
+ /* ============================ PUTS BORDER AROUND DATE WHEN ITS
CLICKED ========================================== */
+
+ $("#calendar_dates span").click(function(){
+ var thisSpan = $(this);
+
+ $("#calendar_dates span").css("border", "2px solid black");
+ $(thisSpan).css("border", "2px solid red");
+
+ var date = $(thisSpan).text();
+ var day = date.substring(0, date.indexOf("/"));
+ var month = date.substring(date.indexOf("/")+1,
date.indexOf("-"));
+ var year = date.substring(date.indexOf("-")+1, date.length);
+
+ var valid_save_date = year + "-" + month + "-" + day;
+
+ $("#deadline_date").val(valid_save_date);
+ });
+
});
function clear_form( form ){
Modified: branches/Version-1_0-branch/controller/js/controller/custom_ui.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/custom_ui.js
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/js/controller/custom_ui.js
2012-04-17 06:30:55 UTC (rev 9161)
@@ -1,18 +1,18 @@
$(document).ready(function() {
$("ul.control_items ul:first").find("h4 img").attr("src",
"controller/images/arrow_down.png");
- $("ul.control_items ul:first").find("li ul").slideDown("slow");
+ $("ul.control_items ul:first").find(".expand_item").slideDown("slow");
$("ul.control_items ul:first").addClass('active');
- /*
===============================================================================
*/
+ /* ========================== EXPANDING/COLLAPSING WHEN TITLE IS
CLICKED ====================== */
$(".expand_list h4").live("click", function(){
if( $(this).parent().parent().hasClass('active')){
- $(this).parent().find("ul").slideUp("slow");
+ $(this).parent().find(".expand_item").slideUp("slow");
$(this).find("img").attr("src",
"controller/images/arrow_right.png");
$(this).parent().parent().removeClass('active');
}else{
- $(this).parent().find("ul").slideDown("slow");
+ $(this).parent().find(".expand_item").slideDown("slow");
$(this).find("img").attr("src",
"controller/images/arrow_down.png");
$(this).parent().parent().addClass('active');
}
@@ -22,43 +22,12 @@
/* ========================== EXPANDING/COLLAPSING ALL LISTS
====================== */
$(".expand_all").live("click", function(){
- $(this).addClass("focus");
- $(".collapse_all").removeClass("focus");
-
- $("ul.expand_list").find("li ul").slideDown("slow");
- $("ul.expand_list").find("li ul").addClass("active");
- $("ul.expand_list").find("li h4 img").attr("src",
"controller/images/arrow_down.png");
- });
-
- $(".collapse_all").live("click", function(){
- $(this).addClass("focus");
- $(".expand_all").removeClass("focus");
- $("ul.expand_list").find("li ul").slideUp("slow");
- $("ul.expand_list").find("li ul").removeClass("active");
- $("ul.expand_list").find("li h4 img").attr("src",
"controller/images/arrow_right.png");
- });
-
- /*
===============================================================================
*/
-
- $("ul.check_items.expand_list h4").live("click", function(){
- if( $(this).parent().hasClass('expanded')){
- $(this).parent().find(".check_item").slideUp("slow");
- $(this).find("img").attr("src",
"controller/images/arrow_right.png");
- $(this).parent().removeClass('expanded');
- }else{
- $(this).parent().find(".check_item").slideDown("slow");
- $(this).find("img").attr("src",
"controller/images/arrow_down.png");
- $(this).parent().addClass('expanded');
- }
- });
-
- $(".expand_all").live("click", function(){
$(this).addClass("focus");
$(".collapse_all").removeClass("focus");
-
$("ul.check_items.expand_list").find("div.check_item").slideDown("slow");
-
$("ul.check_items.expand_list").find("div.check_item").addClass("expanded");
+ $("ul.expand_list").find(".expand_item").slideDown("slow");
+ $("ul.expand_list").find(".expand_item").addClass("active");
$("ul.expand_list").find("li h4 img").attr("src",
"controller/images/arrow_down.png");
});
@@ -66,30 +35,13 @@
$(this).addClass("focus");
$(".expand_all").removeClass("focus");
-
$("ul.check_items.expand_list").find("div.check_item").slideUp("slow");
-
$("ul.check_items.expand_list").find("div.check_item").removeClass("expanded");
+ $("ul.expand_list").find(".expand_item").slideUp("slow");
+ $("ul.expand_list").find(".expand_item").removeClass("active");
$("ul.expand_list").find("li h4 img").attr("src",
"controller/images/arrow_right.png");
});
+ /*
==============================================================================
*/
- /*
===============================================================================
*/
-
- $("#calendar_dates span").click(function(){
- var thisSpan = $(this);
-
- $("#calendar_dates span").css("border", "2px solid black");
- $(thisSpan).css("border", "2px solid red");
-
- var date = $(thisSpan).text();
- var day = date.substring(0, date.indexOf("/"));
- var month = date.substring(date.indexOf("/")+1,
date.indexOf("-"));
- var year = date.substring(date.indexOf("-")+1, date.length);
-
- var valid_save_date = year + "-" + month + "-" + day;
-
- $("#deadline_date").val(valid_save_date);
- });
-
if( $("#frm_control_items").length > 0 ){
var check_box_arr =
$("#frm_control_items").find("input[type='checkbox']");
Deleted:
branches/Version-1_0-branch/controller/js/controller/jquery-ui.custom.min_bac.js
===================================================================
---
branches/Version-1_0-branch/controller/js/controller/jquery-ui.custom.min_bac.js
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/js/controller/jquery-ui.custom.min_bac.js
2012-04-17 06:30:55 UTC (rev 9161)
@@ -1,102 +0,0 @@
-/*!
- * jQuery UI 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a,b){var
d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return
false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function
l(a){return!c(a).parents().andSelf().filter(function(){return
c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
-keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return
typeof a==="number"?this.each(function(){var d=
-this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var
a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
-"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return
this.css("zIndex",a);if(this.length){a=c(this[0]);for(var
b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return
b}a=a.parent()}}return 0},disableSelection:function(){return
this.bind((c.support.selectstart?"selectstart":
-"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return
this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function
d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return
g}var
e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
-outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return
i["inner"+b].call(this);return
this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof
f!=="number")return i["outer"+b].call(this,f);return
this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return
k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
-"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var
a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in
b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var
e in
d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
-a.element[0].parentNode)for(var
e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return
document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return
false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return
true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return
a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
-c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-;/*
- * jQuery UI Datepicker 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- * jquery.ui.core.js
- */
-(function(d,C){function
M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div
id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content
ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return
a.bind("mouseout",
-function(b){b=d(b.target).closest("button, .ui-datepicker-prev,
.ui-datepicker-next, .ui-datepicker-calendar td
a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover
ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button,
.ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td
a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function
H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return
a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new
Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return
this.dpDiv},
-setDefaults:function(a){H(this._defaults,a||{});return
this},_attachDatepicker:function(a,b){var c=null;for(var e in
this._defaults){var
f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var
i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else
f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
-"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div
class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content
ui-helper-clearfix
ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var
c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
-function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return
this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var
c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span
class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c==
-"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var
f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button
type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():
-d.datepicker._showDatepicker(a[0]);return
false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var
b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var
e=function(f){for(var
h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return
i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,
-b){var
c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return
this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=
-1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'"
style="position: absolute; top: -100px; width: 0px; z-index:
-10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
-2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return
this},_destroyDatepicker:function(a){var b=
-d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var
e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else
if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var
b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=
-a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else
if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month,
select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return
f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,
-"datepicker");if(b.hasClass(this.markerClassName)){var
e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else
if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month,
select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return
f==
-a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return
false;for(var
b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return
true;return false},_getInst:function(a){try{return
d.data(a,"datepicker")}catch(b){throw"Missing instance data for this
datepicker";}},_optionDatepicker:function(a,b,c){var
e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return
b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?
-d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof
b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var
h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);
-this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return
a?this._getDate(a):null},_doKeyDown:function(a){var
b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
-b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case
9:d.datepicker._hideDatepicker();c=false;break;case
13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else
d.datepicker._hideDatepicker();return false;case
27:d.datepicker._hideDatepicker();break;case
33:d.datepicker._adjustDate(a.target,
-a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case
34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case
35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case
36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case
37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=
-a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case
38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case
39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,
-"stepMonths"),"M");break;case
40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else
if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else
c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var
b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var
c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);
-return a.ctrlKey||a.metaKey||c<"
"||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return
true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",
-a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var
b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var
c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value=
-"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var
e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);
-c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var
f=d.datepicker._get(b,"duration"),h=function(){var
i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var
g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=
-true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var
b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var
c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});
-a.dpDiv.find("."+this._dayOverClass+"
a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2
ui-datepicker-multi-3
ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&
-!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var
e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var
b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var
e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),
-h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return
b},_findPos:function(a){for(var b=
-this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var
b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var
b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var
c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
-this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
-_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var
e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
-0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var
b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var
c=new
Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var
e=this._getInst(a[0]);e["selected"+(c=="M"?
-"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var
f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);
-this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var
c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else
a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof
a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var
b=this._get(a,"altField");
-if(b){var
c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new
Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var
b=a.getTime();a.setMonth(0);a.setDate(1);return
Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid
arguments";b=typeof b=="object"?
-b.toString():b+"";if(b=="")return null;var
e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof
e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var
f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return
p},m=function(p){var D=
-o(p);p=new
RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing
number at position "+q;q+=p[0].length;return
parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var
E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return
false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=
-function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position
"+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else
s();else switch(a.charAt(A)){case "d":l=m("d");break;case
"D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case
"M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new
Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case
"!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
-1;l=v.getDate();break;case "'":if(o("'"))s();else
k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in
date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else
if(c<100)c+=(new Date).getFullYear()-(new
Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new
Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid
date";return v},ATOM:"yy-mm-dd",
-COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD,
dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d
M
y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var
e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:
-null)||this._defaults.monthNames;var
i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return
o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return
m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var
k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else
l+=a.charAt(k);else switch(a.charAt(k)){case
"d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case
"o":l+=g("o",Math.round(((new
Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
-(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case
"m":l+=g("m",b.getMonth()+1,2);break;case
"M":l+=j("M",b.getMonth(),h,c);break;case
"y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case
"@":l+=b.getTime();break;case
"!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else
u=true;break;default:l+=a.charAt(k)}return
l},_possibleChars:function(a){for(var
b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=
-0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else
b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case
"@":b+="0123456789";break;case "D":case "M":return null;case
"'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return
b},_get:function(a,b){return
a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var
c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);
-var
i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return
this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new
Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;
-i.setDate(i.getDate()+h);return i},f=function(h){try{return
d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var
g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new
Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var
u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case
"d":case "D":g+=parseInt(k[1],10);break;case "w":case
"W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=
-Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case
"Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return
new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof
b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid
Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return
this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return
null;a.setHours(a.getHours()>
-12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var
e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new
Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&
-a.input.val()==""?null:this._daylightSavingAdjust(new
Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var
b=new Date;b=this._daylightSavingAdjust(new
Date(b.getFullYear(),b.getMonth(),b.getDate()));var
c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?
-new Date(9999,9,9):new
Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var
m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new
Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new
Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new
Date(m,g-j,1)),this._getFormatConfig(a));
-n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all"
onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\"
title=\""+n+'"><span class="ui-icon
ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a
class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span
class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var
s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new
Date(m,
-g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a
class="ui-datepicker-next ui-corner-all"
onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\"
title=\""+s+'"><span class="ui-icon
ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a
class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span
class="ui-icon
ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&
-a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button
type="button" class="ui-datepicker-close ui-state-default ui-priority-primary
ui-corner-all"
onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div
class="ui-datepicker-buttonpane
ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button"
class="ui-datepicker-current ui-state-default ui-priority-secondary
ui-corner-all" onclick="DP_jQuery_'+
-B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var
q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var
E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O=
-"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new
Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div
class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case
i[1]-1:y+=" ui-datepicker-group-last";t="
ui-corner-"+(c?"left":"right");break;default:y+="
ui-datepicker-group-middle";t="";break}y+='">'}y+='<div
class="ui-datepicker-header ui-widget-header
ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&
-x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table
class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th
class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var
r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span
title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
-z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new
Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td
class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var
I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td
class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?"
ui-datepicker-other-month":"")+(r.getTime()==
-P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?"
"+this._dayOverClass:"")+(L?" "+this._unselectableClass+"
ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?"
"+this._currentClass:"")+(r.getTime()==b.getTime()?"
ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":'
onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+',
this);return false;"')+">"+(F&&!D?" ":L?'<span class="ui-state-default">'+
-r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?"
ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?"
ui-priority-secondary":"")+'"
href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div
class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe
src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
-"");a._keyEvent=false;return
w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var
j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div
class="ui-datepicker-title">',o="";if(h||!j)o+='<span
class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var
m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month"
onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this,
'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&
-(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?'
selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?" ":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span
class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var
s=(new
Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return
isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,
-e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select
class="ui-datepicker-year"
onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this,
'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?'
selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?" ":"")+o;k+="</div>";return
k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
-(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new
Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var
c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return
b=a&&b>a?a:b},_notifyChange:function(a){var
b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
-a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return
a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return
this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return
32-this._daylightSavingAdjust(new
Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new
Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var
f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,
-e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return
this._isInRange(a,c)},_isInRange:function(a,b){var
c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var
b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new
Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,
-"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof
b=="object"?b:this._daylightSavingAdjust(new
Date(e,c,b)):this._daylightSavingAdjust(new
Date(a.currentYear,a.currentMonth,a.currentDay));return
this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return
this;
-if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var
b=Array.prototype.slice.call(arguments,1);if(typeof
a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return
d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof
arguments[1]=="string")return
d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return
this.each(function(){typeof a==
-"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new
M;d.datepicker.initialized=false;d.datepicker.uuid=(new
Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);
-;
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-04-16
17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-04-17
06:30:55 UTC (rev 9161)
@@ -253,8 +253,8 @@
Procedure description controller no Beskrivelse
Procedure reference controller no Referanse
Procedure attachment controller no Vedlegg
-Procedure start date controller no Start dato
-Procedure end date controller no Slutt dato
+Procedure start date controller no Startdato
+Procedure end date controller no Sluttdato
Procedure valid from date controller no Gyldig fra
New control item controller no Nytt kontrollpunkt
Control item title controller no Tittel
@@ -288,9 +288,9 @@
Lists controller no Lister
Insert Item controller no Sett inn
Control title controller no Tittel
-start_date controller no Start dato
-planned_date controller no Planlagt dato
-end_date controller no Slutt dato
+start_date controller no Startdato
+planned_date controller no Planlagtdato
+end_date controller no Sluttdato
View_locations_for_control controller no Vis kontroller for
lokasjon
Add_locations_for_control controller no Legg til knytning mot
lokasjon
View_component_for_control controller no Vis knytning mot utstyr
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-04-16
17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-04-17
06:30:55 UTC (rev 9161)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.30';
+ $setup_info['controller']['version'] = '0.1.31';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -4,7 +4,7 @@
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'title' => array('type' =>
'varchar','precision' => '100', 'nullable' => False),
- 'description' => array('type' => 'varchar',
'precision' => '255', 'nullable' => True),
+ 'description' => array('type' => 'text',
'nullable' => True),
'start_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'end_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'procedure_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
@@ -56,7 +56,7 @@
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'control_item_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
- 'status' => array('type' => 'bool','nullable'
=> true,'default' => 'false'),
+ 'status' => array('type' => 'int', 'precision'
=> 2, 'nullable' => true),
'comment' => array('type' =>
'varchar','precision' => '255','nullable' => False),
'measurement' => array('type' =>
'varchar', 'precision' => '50', 'nullable' => True),
'check_list_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2012-04-16 17:21:31 UTC (rev 9160)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2012-04-17 06:30:55 UTC (rev 9161)
@@ -621,4 +621,16 @@
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.30';
return $GLOBALS['setup_info']['controller']['currentver'];
+ }
+
+ $test[] = '0.1.30';
+ function controller_upgrade0_1_30()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_control','description',array(
+ 'type' => 'text',
+ 'nullable' => true
+ ));
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.31';
+ return $GLOBALS['setup_info']['controller']['currentver'];
}
\ No newline at end of file
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -150,7 +150,7 @@
<li>
<xsl:for-each
select="calendar_array">
<xsl:choose>
-
<xsl:when test="status = 'control_registered'">
+
<xsl:when test="status = 'CONTROL_REGISTERED'">
<div class="cell">
<a>
<xsl:attribute name="href">
@@ -166,7 +166,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
+
<xsl:when test="status = 'CONTROL_PLANNED'">
<div class="cell">
<a>
<xsl:attribute name="href">
@@ -178,8 +178,20 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
<div class="cell">
+
<a>
+
<xsl:attribute name="href">
+
<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>
+
<img height="15" src="controller/images/status_red_cross.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -191,7 +203,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
<div class="cell" style="position:relative;">
<div id="info_box"></div>
<a>
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -81,7 +81,7 @@
<xsl:text>&year=</xsl:text>
<xsl:value-of select="$year"/>
<xsl:text>&location_code=</xsl:text>
-
<xsl:value-of select="//location_code"/>
+
<xsl:value-of select="$view_location_code"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
</xsl:attribute>
@@ -128,7 +128,7 @@
<div class="months">
<xsl:for-each
select="calendar_array">
<xsl:choose>
-
<xsl:when test="status = 'control_registered'">
+
<xsl:when test="status = 'CONTROL_REGISTERED'">
<div>
<a>
<xsl:attribute name="href">
@@ -144,7 +144,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
+
<xsl:when test="status = 'CONTROL_PLANNED'">
<div>
<a>
<xsl:attribute name="href">
@@ -156,7 +156,19 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
+
<div class="cell">
+
<a>
+
<xsl:attribute name="href">
+
<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>
+
<img height="15" src="controller/images/status_red_cross.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
<div>
<a>
<xsl:attribute name="href">
@@ -169,7 +181,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
<div style="position:relative;">
<div id="info_box" style="position:absolute;display:none;"></div>
<a>
Modified:
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2012-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -9,55 +9,44 @@
<xsl:call-template name="check_list_tab_menu" />
- <!-- ======================= MESSAGE DETAILS
========================= -->
- <h3 class="box_header">Meldingen gjelder</h3>
- <div class="box">
- <div class="row"><label>Kontroll:</label> <xsl:value-of
select="control/title"/></div>
- <div class="row"><label>Utført dato:</label>
- <xsl:choose>
- <xsl:when
test="check_list/completed_date != 0">
- <xsl:value-of
select="php:function('date', $date_format, number(check_list/completed_date))"/>
- </xsl:when>
- <xsl:otherwise>
- Ikke utført
- </xsl:otherwise>
- </xsl:choose>
- </div>
- <div class="row">
+ <!-- ======================= INFO ABOUT MESSAGE
========================= -->
+ <h3 class="box_header ext">Registrer melding</h3>
+ <div class="box ext">
<xsl:choose>
- <xsl:when test="buildings_array/child::node()">
- <select id="building_id"
name="building_id">
- <option value="0">
- Velg bygning
- </option>
- <xsl:for-each
select="buildings_array">
- <option
value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <label>Bygg:</label> <xsl:value-of
select="building/loc1_name"/>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
-
- <!-- ======================= MESSAGE DETAILS
========================= -->
- <h3 class="box_header">Detaljer for meldingen</h3>
- <div class="box">
- <xsl:choose>
<xsl:when
test="check_items_and_cases/child::node()">
-
+
<form id="frmRegCaseMessage"
action="index.php?menuaction=controller.uicase.register_case_message"
method="post">
<input>
- <xsl:attribute
name="name">check_list_id</xsl:attribute>
- <xsl:attribute
name="type">hidden</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- </input>
+ <xsl:attribute
name="name">check_list_id</xsl:attribute>
+ <xsl:attribute
name="type">hidden</xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of
select="check_list/id"/>
+ </xsl:attribute>
+ </input>
+
+ <!-- ================== BYGG
===================== -->
+ <div class="row">
+ <xsl:choose>
+ <xsl:when
test="buildings_array/child::node()">
+
<label>Bygg:</label>
+ <select
id="building_id" name="building_id">
+
<option value="0">
+
Velg bygning
+
</option>
+
<xsl:for-each select="buildings_array">
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:for-each>
+
</select>
+ </xsl:when>
+ <xsl:otherwise>
+
<label>Bygg:</label> <xsl:value-of select="building/loc1_name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+
<!-- === TITLE === -->
<div class="row">
<label>Tittel på
melding:</label>
@@ -82,17 +71,17 @@
<input type="file" id="file"
name="file" />
</div>
- <h3>Velg sjekkpunkter som skal være med
i melding</h3>
+ <h3>Velg hvilke saker meldingen
gjelder</h3>
<ul class="cases">
<xsl:for-each
select="check_items_and_cases">
<xsl:choose>
<xsl:when
test="cases_array/child::node()">
- <li>
+ <li
class="check_item">
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of
select="id"/></xsl:variable>
-
<li style="list-style:none;"><input type="checkbox"
name="case_ids[]" value="{$cases_id}" /><xsl:value-of select="descr"/></li>
+
<li><input type="checkbox" name="case_ids[]"
value="{$cases_id}" /><xsl:value-of select="descr"/></li>
</xsl:for-each>
</ul>
</li>
@@ -103,7 +92,7 @@
<div class="form-buttons">
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <input class="btn focus"
type="submit" name="save_control" value="Send melding" title="{$lang_save}" />
+ <input class="btn"
type="submit" name="save_control" value="Send melding" title="{$lang_save}" />
</div>
</form>
</xsl:when>
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/add_check_list.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -21,12 +21,14 @@
});
});
</script>
-
+<!-- ================== ADD CHECKLIST ========================= -->
+
<div id="main_content" class="medium">
- <h1>Registrere sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
-
+ <h1>Kontroll: <xsl:value-of select="control/title"/></h1>
+ <h2>Bygg: <xsl:value-of select="location_array/loc1_name"/></h2>
+
<div id="check_list_menu">
<a href="#" class="active">
Vis detaljer for sjekkliste
@@ -39,11 +41,17 @@
</a>
</div>
-
- <h3 class="box_header">Sjekklistedetaljer</h3>
- <fieldset class="check_list_details">
+ <!-- ================== CHECKLIST DETAILS ===================== -->
+ <div id="check_list_details">
+ <h3 class="box_header">Sjekklistedetaljer</h3>
<form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list.save_check_list"
method="post">
-
+ <xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
+ <xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
+
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="location_code"
value="{$location_code}" />
+
+ <!-- Shows dates that can be picked for setting a
deadline date
<div id="calendar_dates">
<xsl:for-each select="calendar_array">
<xsl:variable
name="cal_date"><xsl:value-of select="."/></xsl:variable>
@@ -51,45 +59,29 @@
<span><xsl:value-of
select="php:function('date', $date_format, number( $cal_date ) )"/></span>
</xsl:for-each>
</div>
-
- <xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
- <xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
-
- <input type="hidden" name="control_id"
value="{$control_id}" />
- <input type="hidden" name="location_code"
value="{$location_code}" />
-
- <fieldset class="add_check_list">
- <div>
+ -->
+
+ <fieldset>
+ <div class="row">
<label>Status</label>
- <select name="status">
+ <select id="status" name="status">
<option value="0"
SELECTED="SELECTED">Ikke utført</option>
<option value="1"
>Utført</option>
</select>
</div>
- <div>
+ <div class="row">
<label>Fristdato</label>
- <input class="date">
- <xsl:attribute
name="id">deadline_date</xsl:attribute>
- <xsl:attribute
name="name">deadline_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <input type="text" id="deadline_date"
name="deadline_date" class="date">
<xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format, number(deadline))"/></xsl:attribute>
</input>
</div>
- <div>
+ <div class="row">
<label>Planlagt dato</label>
- <input class="date">
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:attribute
name="value"></xsl:attribute>
- </input>
+ <input type="text" id="planned_date"
name="planned_date" class="date" value="" />
</div>
- <div>
+ <div class="row">
<label>Utført dato</label>
- <input class="date">
- <xsl:attribute
name="id">completed_date</xsl:attribute>
- <xsl:attribute
name="name">completed_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <input type="text" id="completed_date"
name="completed_date" class="date">
<xsl:if
test="check_list/completed_date != ''">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
</xsl:if>
@@ -98,20 +90,20 @@
<!--
div><label>Utstyr</label><input
name="equipment_id" /></div>
-->
- <div>
- <label class="comment">Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of
select="check_list/comment"/>
- </textarea>
- </div>
</fieldset>
+ <div class="comment">
+ <label>Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of select="check_list/comment"/>
+ </textarea>
+ </div>
+
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
+ <input class="btn not_active" type="submit"
value="Lagre detaljer" />
</div>
- </form>
- </fieldset>
-
+ </form>
</div>
+</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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -3,40 +3,47 @@
<xsl:param name="active_tab" />
<div id="check_list_menu">
- <a>
- <xsl:if test="$active_tab = 'view_details'">
- <xsl:attribute
name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<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>
- Vis detaljer for sjekkliste
- </a>
- <a>
- <xsl:if test="$active_tab = 'view_cases'">
- <xsl:attribute
name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<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>
- Vis saker
- </a>
- <a>
- <xsl:if test="$active_tab = 'view_control_info'">
- <xsl:attribute
name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<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>
- Vis info om kontroll
- </a>
+ <!-- ================== LOADS VIEW CHECKLIST DETAILS
===================== -->
+ <div class="left_btns">
+ <a>
+ <xsl:if test="$active_tab = 'view_details'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<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>
+ Vis detaljer for sjekkliste
+ </a>
+ <!-- ================== LOADS CASES FOR CHECKLIST
===================== -->
+ <a>
+ <xsl:if test="$active_tab = 'view_cases'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<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>
+ Vis saker
+ </a>
+ <!-- ================== LOADS INFO ABOUT CONTROL
===================== -->
+ <a>
+ <xsl:if test="$active_tab =
'view_control_info'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<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>
+ Vis info om kontroll
+ </a>
+ </div>
+
<div class="right_btns">
+ <!-- ================== REGISTER NEW CASE
===================== -->
<a class="btn focus first">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
@@ -45,6 +52,7 @@
</xsl:attribute>
Registrer sak
</a>
+ <!-- ================== REGISTER NEW MESSAGE
===================== -->
<a class="btn focus">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -4,6 +4,7 @@
<div id="main_content" class="medium">
+ <!-- ======================= CALENDAR
================================== -->
<script>
$(function() {
$( "#planned_date" ).datepicker({
@@ -31,44 +32,43 @@
});
</script>
+ <!-- ================== EDIT CHECKLIST ========================= -->
+
+ <div>
<h1>Kontroll: <xsl:value-of select="control/title"/></h1>
<h2>Bygg: <xsl:value-of select="location_array/loc1_name"/></h2>
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
<xsl:call-template name="check_list_tab_menu">
<xsl:with-param
name="active_tab">view_details</xsl:with-param>
</xsl:call-template>
+ </div>
+ <!-- ================== CHECKLIST DETAILS ===================== -->
+ <div id="check_list_details">
<h3 class="box_header">Sjekklistedetaljer</h3>
- <fieldset class="check_list_details">
<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}" />
- <div class="col_1">
- <div>
- <label>ID</label>
- <input class="id" disabled="disabled">
- <xsl:attribute
name="name">check_list_id</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
- </input>
- </div>
- <div>
+ <fieldset class="col_1">
+ <div class="row">
<label>Status</label>
<xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select name="status">
+ <select id="status" name="status">
<xsl:choose>
<xsl:when
test="check_list/status = 0">
- <option value="0"
SELECTED="SELECTED">Ikke utført</option>
- <option value="1"
>Utført</option>
+ <option
value="1">Utført</option>
+ <option value="0"
SELECTED="SELECTED" >Ikke utført</option>
</xsl:when>
<xsl:when
test="check_list/status = 1">
+ <option value="1"
SELECTED="SELECTED">Utført</option>
<option value="0">Ikke
utført</option>
- <option value="1"
SELECTED="SELECTED">Utført</option>
</xsl:when>
</xsl:choose>
</select>
</div>
- <div>
+ <div class="row">
<label>Skal utføres innen</label>
<input class="date">
<xsl:attribute
name="id">deadline_date</xsl:attribute>
@@ -79,7 +79,7 @@
</xsl:if>
</input>
</div>
- <div>
+ <div class="row">
<label>Planlagt dato</label>
<input class="date">
<xsl:attribute
name="id">planned_date</xsl:attribute>
@@ -90,7 +90,7 @@
</xsl:if>
</input>
</div>
- <div>
+ <div class="row">
<label>Utført dato</label>
<input class="date">
<xsl:attribute
name="id">completed_date</xsl:attribute>
@@ -101,20 +101,20 @@
</xsl:if>
</input>
</div>
- </div>
- <div class="col_2">
- <div>
+ </fieldset>
+ <fieldset class="col_2">
+ <div class="row">
<label>Antall åpne saker</label>
<xsl:value-of
select="check_list/num_open_cases"/>
</div>
- <div>
+ <div class="row">
<label>Antall ventende saker</label>
<xsl:value-of
select="check_list/num_pending_cases"/>
</div>
- </div>
+ </fieldset>
- <div>
- <label class="comment">Kommentar</label>
+ <div class="comment">
+ <label>Kommentar</label>
<textarea>
<xsl:attribute
name="name">comment</xsl:attribute>
<xsl:value-of select="check_list/comment"/>
@@ -123,9 +123,9 @@
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
+ <input class="btn not_active" type="submit"
name="save_control" value="Lagre detaljer" />
</div>
</form>
- </fieldset>
-</div>
+ </div>
+ </div>
</xsl:template>
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/register_case.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -11,88 +11,90 @@
<div id="view_cases">
- <h3 class="box_header">Registrer sak/måling</h3>
- <div class="tab_item active">
+ <h3 class="box_header ext">Registrer sak/måling</h3>
+ <div class="tab_item active ext">
- <xsl:choose>
- <xsl:when
test="control_items_for_check_list/child::node()">
-
- <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
-
- <ul id="control_items_list" class="check_items
expand_list">
- <xsl:for-each
select="control_items_for_check_list">
- <li>
- <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
- <xsl:choose>
- <xsl:when
test="type = 'control_item_type_1'">
- <form
class="frm_register_case"
action="index.php?menuaction=controller.uicase.register_case&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="check_list_id" type="hidden"><xsl:attribute
name="value"><xsl:value-of select="//check_list/id"/></xsl:attribute></input>
-
<input name="status" type="hidden" value="0" />
-
<input name="type" type="hidden" value="control_item_type_1" />
-
-
<div class="check_item">
-
<div>
-
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<div class="form-buttons">
-
<input type="submit" name="save_control" value="Registrer sak"
class="not_active" />
-
</div>
-
</div>
- </form>
- </xsl:when>
- <xsl:when
test="type = 'control_item_type_2'">
- <form
class="frm_register_case"
action="index.php?menuaction=controller.uicase.register_case&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="check_list_id" type="hidden"><xsl:attribute
name="value"><xsl:value-of select="//check_list/id"/></xsl:attribute></input>
-
<input name="type" type="hidden" value="control_item_type_2" />
-
- <div
class="check_item">
-
<div>
-
<label>Status</label>
-
<select name="status">
-
<option value="0" SELECTED="SELECTED">Ikke utført</option>
-
<option value="1" >Utført</option>
-
<option value="2" >Venter på tilbakemelding</option>
-
</select>
-
</div>
- <div>
- <label
class="comment">Registrer målingsverdi</label>
-
<input>
-
<xsl:attribute name="name">measurement</xsl:attribute>
-
<xsl:attribute name="type">text</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="measurement"/>
-
</xsl:attribute>
-
</input>
- </div>
- <div>
-
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
- <div
class="form-buttons">
-
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="Registrer måling"
class="not_active" title="{$lang_save}" />
-
</div>
- </div>
- </form>
- </xsl:when>
- </xsl:choose>
- </li>
- </xsl:for-each>
- </ul>
+ <div class="expand_menu"><div class="expand_all">Vis
alle</div><div class="collapse_all focus">Skjul alle</div></div>
+
+ <ul class="control_groups">
+ <xsl:for-each select="control_groups_with_items_array">
+ <xsl:choose>
+ <xsl:when test="control_items/child::node()">
+ <li>
+ <h3><xsl:value-of
select="control_group/group_name"/></h3>
+ <ul class="expand_list">
+ <xsl:for-each
select="control_items">
+ <li>
+
<h4><img src="controller/images/arrow_right.png" /><span><xsl:value-of
select="title"/></span></h4>
+
<xsl:choose>
+
<xsl:when test="type = 'control_item_type_1'">
+
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.register_case&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="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
+
<input name="status" type="hidden" value="0" />
+
<input name="type" type="hidden"
value="control_item_type_1" />
+
+
<div>
+
<label class="comment">Beskrivelse av sak</label>
+
<textarea name="case_descr">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<input type="submit" class="btn not_active"
name="save_control" value="Registrer sak" />
+
</form>
+
</xsl:when>
+
<xsl:when test="type = 'control_item_type_2'">
+
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.register_case&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="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
+
<input name="type" type="hidden"
value="control_item_type_2" />
+
+
<div>
+
<label>Status</label>
+
<select name="status">
+
<option value="0"
SELECTED="SELECTED">Ikke utført</option>
+
<option value="1" >Utført</option>
+
<option value="2" >Venter på
tilbakemelding</option>
+
</select>
+
</div>
+
<div>
+
<label class="comment">Registrer målingsverdi</label>
+
<input>
+
<xsl:attribute
name="name">measurement</xsl:attribute>
+
<xsl:attribute name="type">text</xsl:attribute>
+
<xsl:attribute name="value">
+
<xsl:value-of select="measurement"/>
+
</xsl:attribute>
+
</input>
+
</div>
+
<div>
+
<label class="comment">Beskrivelse av sak</label>
+
<textarea name="case_descr">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Registrer
måling" class="not_active" title="{$lang_save}" />
+
</form>
+
</xsl:when>
+
</xsl:choose>
+
+ </li>
+ </xsl:for-each>
+ </ul>
+ </li>
</xsl:when>
<xsl:otherwise>
- Alle sjekkpunkter for kontroll er
registert som åpne/håndterte saker
+ <li class="list_item">
+ <h3><xsl:value-of
select="control_group/group_name"/></h3>
+ <div>Ingen kontrollpunkt for
denne gruppen</div>
+ </li>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>
+ </xsl:for-each>
+ </ul>
</div>
</div>
</div>
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_check_list.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -5,7 +5,7 @@
<div id="main_content" class="medium">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
+
<h1>Sjekkliste</h1>
<fieldset class="control_details">
<div class="row"><label>Tittel</label><xsl:value-of
select="check_list/status"/></div>
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-04-16 17:21:31 UTC (rev 9160)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_closed_cases.xsl
2012-04-17 06:30:55 UTC (rev 9161)
@@ -9,11 +9,12 @@
</xsl:call-template>
<div class="tab_item active">
+ <h2>Målinger</h2>
<xsl:choose>
- <xsl:when
test="closed_check_items_and_cases/child::node()">
+ <xsl:when
test="closed_check_items_and_measurements/child::node()">
<ul class="check_items">
- <xsl:for-each
select="closed_check_items_and_cases">
+ <xsl:for-each
select="closed_check_items_and_measurements">
<xsl:choose>
<xsl:when
test="cases_array/child::node()">
<li
class="check_item_case">
@@ -21,24 +22,140 @@
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><xsl:number />. <xsl:value-of select="descr"/>
+
<li>
+
<!-- ==================== COL1: ORDERNR ===================== -->
+
<div class="col_1">
+
<span class="order_nr"><xsl:number /></span>.
+
</div>
+
+
<!-- ==================== COL2: CASE CONTENT ===================== -->
+
<div class="col_2">
+
<!-- =============== SHOW CASE INFO ============= -->
+
<div class="case_info">
+
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label>Måleverdi:</label>
+
<span class="measurement"><xsl:value-of
select="measurement"/></span>
+
</div>
+
<!-- DESCRIPTION -->
+
<div class="row">
+
<label>Beskrivelse:</label>
+
</div>
+
<div class="case_descr"><xsl:value-of select="descr"/></div>
+
</div>
+
</div>
+
<!-- ==================== COL3: MESSAGE LINK ===================== -->
+
<div class="col_3">
<xsl:choose>
<xsl:when test="location_item_id > 0">
-
<div style="float:right;">
<a target="_blank">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+
<xsl:text>&id=</xsl:text>
+
<xsl:value-of
select="location_item_id"/>
+
</xsl:attribute>
+
Vis melding
+
</a>
+
</xsl:when>
+
<xsl:otherwise>
+
<span class="message">Ingen melding</span>
+
</xsl:otherwise>
+
</xsl:choose>
+
</div>
+
+
</li>
+
</xsl:for-each>
+ </ul>
+ </li>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </ul>
+
+ </xsl:when>
+ <xsl:otherwise>
+ <p>Ingen lukkede målinger</p>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <h2 class="last">Saker</h2>
+ <xsl:choose>
+ <xsl:when
test="closed_check_items_and_cases/child::node()">
+
+ <ul class="check_items">
+ <xsl:for-each
select="closed_check_items_and_cases">
+ <xsl:choose>
+ <xsl:when
test="cases_array/child::node()">
+ <li
class="check_item_case">
+
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
+ <ul>
+
<xsl:for-each select="cases_array">
+
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
+
<li>
+
<!-- ==================== COL1: ORDERNR ===================== -->
+
<div class="col_1">
+
<span class="order_nr"><xsl:number /></span>.
+
</div>
+
+
<!-- ==================== COL2: CASE CONTENT ===================== -->
+
<div class="col_2">
+
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9161] Merge 9120:9160 from trunk,
Sigurd Nes <=