[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9847] Merge 9840:9846 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9847] Merge 9840:9846 from trunk |
|
Date: |
Tue, 14 Aug 2012 08:42:44 +0000 |
Revision: 9847
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9847
Author: sigurdne
Date: 2012-08-14 08:42:33 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Merge 9840:9846 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.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/booking/inc/class.socompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/inc/import/default/cvs_import_kunstoversikt_bkb
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,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839
+
/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,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -125,18 +125,6 @@
$filter_clauses[] = "org.id IN (SELECT organization_id
from activity_activity where state = 3 OR state = 4)";
}
-/*
- // All parties with contracts of type X
- if(isset($filters['party_type']))
- {
- $party_type =
$this->marshal($filters['party_type'],'int');
- if(isset($party_type) && $party_type > 0)
- {
- $filter_clauses[] = "contract.location_id =
{$party_type}";
- }
- }
-*/
-
if(count($filter_clauses))
{
$clauses[] = join(' AND ', $filter_clauses);
@@ -159,6 +147,8 @@
$columns[] = 'org.email';
$columns[] = 'org.description';
$columns[] = 'org.address';
+ $columns[] = 'org.zip_code';
+ $columns[] = 'org.city';
$columns[] = 'org.district';
$columns[] = 'org.change_type';
$columns[] = 'org.transferred';
@@ -204,9 +194,6 @@
$tables = "bb_organization org";
}
-
- //$join_contracts = " {$this->left_join}
rental_contract_party c_p ON (c_p.party_id = party.id)
- //{$this->left_join} rental_contract contract ON (contract.id =
c_p.contract_id)";
//var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}");
return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
@@ -595,14 +582,10 @@
$name = $organization->get_name();
$orgnr = $organization->get_organization_number();
$homepage = $organization->get_homepage();
- $phone = $organization->get_phone();
- $email = $organization->get_email();
- $description = $organization->get_description();
$street = $organization->get_address();
$streetnumber = $organization->get_address_number();
$zip_code = $organization->get_zip_code();
$city = $organization->get_city();
- $district = $organization->get_district();
if($organization->get_original_org_id() &&
$organization->get_original_org_id() != '')
{
$original_org_id =
$organization->get_original_org_id();
@@ -615,15 +598,11 @@
$values[] = "NAME='{$name}'";
$values[] = "HOMEPAGE='{$homepage}'";
- $values[] = "PHONE='{$phone}'";
- $values[] = "EMAIL='{$email}'";
- $values[] = "DESCRIPTION='{$description}'";
$values[] = "ADDRESS='{$street}'";
$values[] = "ADDRESSNUMBER='{$streetnumber}'";
$values[] = "ZIP_CODE='{$zip_code}'";
$values[] = "CITY='{$city}'";
$values[] = "ORGNO='{$orgnr}'";
- $values[] = "DISTRICT='{$district}'";
$values[] = "ORIGINAL_ORG_ID={$original_org_id}";
$vals = implode(',',$values);
@@ -645,15 +624,11 @@
$name = $org_info['name'];
$orgnr = $org_info['orgnr'];
$homepage = $org_info['homepage'];
- $phone = $org_info['phone'];
- $email = $org_info['email'];
- $description = $org_info['description'];
$street_1 = $org_info['street'];
$street_2 = $org_info['streetnumber'];
$street = $street_1 . ' ' . $street_2;
$zip_code = $org_info['zip'];
$city = $org_info['postaddress'];
- $district = $org_info['district'];
$activity_id = 1;
$show_in_portal = 1;
@@ -673,13 +648,13 @@
$values[] = "'{$name}'";
$values[] = "'{$homepage}'";
- $values[] = "'{$phone}'";
- $values[] = "'{$email}'";
- $values[] = "'{$description}'";
+ $values[] = "''";
+ $values[] = "''";
+ $values[] = "''";
$values[] = "'{$street}'";
$values[] = "'{$zip_code}'";
$values[] = "'{$city}'";
- $values[] = "'{$district}'";
+ $values[] = "''";
$values[] = "'{$orgnr}'";
$values[] = $this->marshal($activity_id, 'int');
$values[] = $show_in_portal;
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -537,17 +537,19 @@
if($activity->get_group_id() && $activity->get_group_id() > 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
true));
- if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
+/* if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
$subject, $body);
- else if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ else*/
+ if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
$subject, $body);
}
else if($activity->get_organization_id() &&
$activity->get_organization_id() > 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
- if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
+/* if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
$subject, $body);
- else if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ else*/
+ if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
$subject, $body);
}
}
@@ -592,18 +594,20 @@
{
//$contact_person2 =
activitycalendar_socontactperson::get_instance()->get_group_contact2($activity>get_group_id());
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
true));
- if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
+/* if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
$subject, $body);
- else if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ else */
+ if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
$subject, $body);
}
else if($activity->get_organization_id() &&
$activity->get_organization_id() > 0)
{
//$contact_person2 =
activitycalendar_socontactperson::get_instance()->get_oup_contact2($activity>get_group_id());
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
- if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
+/* if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
$subject, $body);
- else if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ else */
+ if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
$subject, $body);
}
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -457,7 +457,6 @@
$secret_param = phpgw::get_var('secret', 'GET');
if(!isset($id) || $id == '')
{
- var_dump(3);
//select activity to edit
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
$organizations =
$this->so_organization->get(null, null, 'org.name', true, null, null,
array('edit_from_frontend' => 'yes'));
@@ -743,12 +742,9 @@
$org_info['name'] =
phpgw::get_var('orgname');
$org_info['orgnr'] =
phpgw::get_var('orgno');
$org_info['homepage'] =
phpgw::get_var('homepage');
- $org_info['phone'] =
phpgw::get_var('phone');
- $org_info['email'] =
phpgw::get_var('email');
- $org_info['description'] =
phpgw::get_var('org_description');
$org_info['street'] =
phpgw::get_var('address');
- //$org_info['zip'] =
phpgw::get_var('postaddress');
- $org_info['district'] =
$organization->get_district();
+ $org_info['zip'] =
phpgw::get_var('postzip');
+ $org_info['postaddress'] =
phpgw::get_var('postaddress');
$org_info['status'] = "change";
$org_info['original_org_id'] = $org_id;
$o_id =
$this->so_activity->add_organization_local($org_info);
@@ -757,19 +753,11 @@
$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);
- $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['org_id'] = $o_id;
- $contact2['group_id'] = 0;
-
$this->so_activity->add_contact_person_local($contact2);
-
$message = lang('change_request_ok',
$org_info['name']);
$this->render('organization_reciept.php', array
@@ -793,8 +781,6 @@
(
'organization' =>
$organization,
'contact1' =>
$persons[0],
- 'contact2' =>
$persons[1],
- 'districts' =>
$districts,
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
'error' =>
isset($error) ? $error : phpgw::get_var('error')
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -160,7 +160,6 @@
function allOK()
{
- alert(document.getElementById('district').value);
if(document.getElementById('title').value == null ||
document.getElementById('title').value == '')
{
alert("Tittel må fylles ut!");
@@ -336,7 +335,7 @@
}
?>
</optgroup>
- <optgroup label="<?php echo
lang('building') ?>">
+ <optgroup label="<?php echo
lang('external_arena') ?>">
<?php
foreach($arenas as $arena)
{
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/organization_edit.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -37,306 +37,46 @@
div_address.style.display="none";
}
-function allOK()
+function isOK()
{
- if(document.getElementById('title').value == null ||
document.getElementById('title').value == '')
+ if(document.getElementById('orgname').value == null ||
document.getElementById('orgname').value == '')
{
- alert("Tittel må fylles ut!");
+ alert("Organisasjonsnavn må fylles ut!");
return false;
- }
- if(document.getElementById('internal_arena_id').value == null ||
document.getElementById('internal_arena_id').value == 0)
+ }
+ if(document.getElementById('org_contact1_name').value == null ||
document.getElementById('org_contact1_name').value == '')
{
- if(document.getElementById('arena_id').value == null ||
document.getElementById('arena_id').value == 0)
- {
- alert("Arena må fylles ut!");
- return false;
- }
+ alert("Navn på kontaktperson må fylles ut!");
+ return false;
}
- if(document.getElementById('time').value == null ||
document.getElementById('time').value == '')
+ if(document.getElementById('org_contact1_phone').value == null ||
document.getElementById('org_contact1_phone').value == '')
{
- alert("Tid må fylles ut!");
+ alert("Telefonnummer til kontaktperson må fylles ut!");
return false;
}
- if(document.getElementById('category').value == null ||
document.getElementById('category').value == 0)
+ if(document.getElementById('org_contact1_mail').value == null ||
document.getElementById('org_contact1_mail').value == '')
{
- alert("Kategori må fylles ut!");
+ alert("E-post for kontaktperson må fylles ut!");
return false;
}
- if(document.getElementById('office').value == null ||
document.getElementById('office').value == 0)
+ if(document.getElementById('org_contact2_mail').value == null ||
document.getElementById('org_contact2_mail').value == '')
{
- alert("Hovedansvarlig kulturkontor må fylles ut!");
+ alert("Begge felter for E-post må fylles ut!");
return false;
}
+ if(document.getElementById('org_contact1_mail').value !=
document.getElementById('org_contact2_mail').value)
+ {
+ alert("E-post må være den samme i begge felt!");
+ return false;
+ }
else
+ {
return true;
+ }
}
</script>
-<style>
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
- text-align: left;
-}
-
-#frontend dl.proplist-col {
- width: 600px; !important
-}
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-div.success {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: green;
- border:1px solid #9F6000;
- color: white;
-}
-
-div.error {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: red;
- border:1px solid #9F6000;
- color: white;
-}
-</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
@@ -350,50 +90,64 @@
</div>
<?php }?>
</div>
+ <div class="pageTop">
<h1><?php echo lang('edit_organization') ?></h1>
<form action="#" method="post">
- <input type="hidden" name="organization_id"
id="organization_id" value="<?php echo $organization->get_id()?>" />
- <dl class="proplist-col" style="width: 200%">
- <dt>
- <label for="organization_id"><?php echo
lang('organization') ?></label>
- </dt>
- <dt><label
for="orgname">Organisasjonsnavn</label></dt>
- <dd><input type="text"
name="orgname" value="<?php echo $organization->get_name()?>"/></dd>
- <dt><label
for="orgno">Organisasjonsnummer</label></dt>
- <dd><input type="text"
name="orgno" value="<?php echo
$organization->get_organization_number()?>"/></dd>
- <dt><label
for="homepage">Hjemmeside</label></dt>
- <dd><input type="text"
name="homepage" value="<?php echo $organization->get_homepage()?>"/></dd>
- <dt><label
for="email">E-post</label></dt>
- <dd><input type="text"
name="email" value="<?php echo $organization->get_email()?>"/></dd>
- <dt><label
for="phone">Telefon</label></dt>
- <dd><input type="text"
name="phone" value="<?php echo $organization->get_phone()?>"/></dd>
- <dt><label
for="street">Gate</label></dt>
- <dd><input type="text"
name="address" id="address" value="<?php echo $organization->get_address()?>"/>
- <div
id="address_container"></div></dd>
- <dt><label
for="org_description">Beskrivelse</label></dt>
- <dd><textarea rows="10"
cols="100" name="org_description"><?php echo
$organization->get_description()?></textarea></dd>
- <hr/>
- <b>Kontaktperson 1</b><br/>
- <dt><label
for="contact1_name">Navn</label>
- <input type="text"
name="org_contact1_name" value="<?php echo
isset($contact1)?$contact1->get_name():''?>"/><br/>
- <dt><label
for="contact1_phone">Telefon</label>
- <input type="text"
name="org_contact1_phone" value="<?php echo
isset($contact1)?$contact1->get_phone():''?>"/><br/>
- <dt><label
for="contact1_mail">E-post</label>
- <input type="text"
name="org_contact1_email" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"/><br/>
- <b>Kontaktperson 2</b><br/>
- <dt><label
for="contact2_name">Navn</label>
- <input type="text"
name="org_contact2_name" value="<?php echo
isset($contact2)?$contact2->get_name():''?>"/><br/>
- <dt><label
for="contact2_phone">Telefon</label>
- <input type="text"
name="org_contact2_phone" value="<?php echo
isset($contact2)?$contact2->get_phone():''?>"/><br/>
- <dt><label
for="contact2_mail">E-post</label>
- <input type="text"
name="org_contact2_email" value="<?php echo
isset($contact2)?$contact2->get_email():''?>"/><br/>
- </dt>
+ <dl class="proplist-col">
+ <input type="hidden" name="organization_id"
id="organization_id" value="<?php echo $organization->get_id()?>" />
+ <DIV style="overflow: auto;">
+ <P>Endre organisasjon <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
+
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
+ target="name"><IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ </P>
+ Felt merket med (*) er påkrevde felt
<BR/><BR/>
+ <P></P>
+
+ <dt><label
for="orgname">Organisasjonsnavn (*)</label>
+ <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
+
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
+ target="name"><IMG
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ </dt>
+ <dd><input type="text" name="orgname"
id="orgname" size="80" value="<?php echo $organization->get_name()?>"/></dd>
+ <dt><label
for="orgno">Organisasjonsnummer</label></dt>
+ <dd><input type="text" name="orgno"
value="<?php echo $organization->get_organization_number()?>"/></dd>
+ <DT style="margin-right: 20px; float:
left;"><label for="street">Gateadresse</label>
+ <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
+
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
+ target="name"><IMG
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
+ <INPUT id="address"
onkeyup="javascript:get_address_search()" name="address" size="50" type="text"
value="<?php echo $organization->get_address()?>"><BR/>
+ <DIV
id="address_container"></DIV>
+ </DT>
+ <DT style="clear: right; float:
left;"><LABEL for="number">Husnummer</LABEL><BR/>
+ <INPUT name="number" size="5"
type="text"/>
+ </DT><BR/>
+ <DT style="clear: left; margin-right:
20px; float: left;"><LABEL for="postzip">Postnummer</LABEL><BR/>
+ <INPUT name="postzip" size="5"
type="text" value="<?php echo $organization->get_zip_code()?>"/>
+ </DT>
+ <DT style="float: left;"><LABEL
for="postaddress">Poststed</LABEL><BR/>
+ <INPUT name="postaddress" size="40" type="text"
value="<?php echo $organization->get_city()?>"/>
+ </DT><BR><BR>
+ </DIV>
+ <DT><LABEL for="homepage">Hjemmeside <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name">
+ <IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL>
+ </DT>
+ <DD><INPUT name="homepage" value="<?php echo
$organization->get_homepage()?>" size="80" type="text"></DD><BR/><BR/>
+ <DIV style="overflow: auto;">
+ Kontaktperson for organisasjonen <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name">
+ <IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
+ <DT><LABEL for="contact1_name">Navn (*)</LABEL></DT>
+ <DD><INPUT name="org_contact1_name" id="org_contact1_name"
size="80" type="text" value="<?php echo
isset($contact1)?$contact1->get_name():''?>"></DD>
+ <DT><LABEL for="contact1_phone">Telefon (*)</LABEL></DT>
+ <DD><INPUT name="org_contact1_phone"
id="org_contact1_phone" type="text" value="<?php echo
isset($contact1)?$contact1->get_phone():''?>"></DD>
+ <DT><LABEL for="contact1_mail">E-post (*)</LABEL></DT>
+ <DD><INPUT name="org_contact1_mail" id="org_contact1_mail"
size="50" type="text" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"></DD>
+ <DT><LABEL for="contact2_mail">Gjenta e-post
(*)</LABEL></DT>
+ <DD><INPUT name="org_contact2_mail" id="org_contact2_mail"
size="50" type="text" value="<?php echo
isset($contact1)?$contact1->get_email():''?>"></DD>
+ </DIV>
<div class="form-buttons">
<input type="submit" name="save_org"
value="<?php echo lang('send_change_request') ?>"/>
</div>
</dl>
-
</form>
-
</div>
</div>
\ No newline at end of file
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -601,10 +601,9 @@
//$orders = array();
$export_info = array();
$output = array();
+
$log = array();
- $log[] = 'Ordrenr;Kunde navn - Nummer;Varelinjer med
dato;Bygg;Beløp';
-
/* NOTE: The specification states that values of type
date
* should be left padded with spaces. The example file,
* however, is right padded with spaces.
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -133,7 +133,11 @@
if ($export_type == 'external') {
$export_result['total_items'] = $export_result['export']['header_count'];
- $export_log =
$export_result['export']['data_log'];
+ if
(!is_null($export_result['export']['data_log'])) {
+ $export_log .=
$export_result['export']['data_log'];
+ } else {
+ $export_log .=
"";
+ }
}
$export_configurations[$export_type][$export['id']] = $conf;
@@ -142,6 +146,10 @@
}
$export_data[$export_type] =
$this->combine_export_result_data($export_results[$export_type]);
}
+
+ $log = "Ordrenr;Kunde navn - Nummer;Varelinjer
med dato;Bygg;Beløp\n";
+ $log .= $export_log;
+ $export_log = $log;
if ($do_generate_files === false) {
return false;
@@ -164,7 +172,7 @@
$this->file_storage->attach($export_file)->persist();
- if ($export_type == 'external') {
+ if ($export_type == 'external'){
$entity_export_file['log_filename'] =
'log_'.$export_type.'_'.$entity_export_file['id'].'.csv';
$log_export_file = new
booking_storage_object($entity_export_file['log_filename']);
$log_export_files[] = $log_export_file;
Modified: branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++ branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -390,7 +390,41 @@
}
+ public function add_role($data)
+ {
+ $receipt = array();
+ $values_insert['name']
=$this->db->db_addslashes($data['name']);
+ $values_insert['remark']
= $this->db->db_addslashes($data['remark']);
+ $values_insert['responsibility_id'] =
$data['responsibility_id'];
+ $values_insert['location_level'] =
implode(',', $data['location_level']);
+ $values_insert['modified_date'] =
time();
+ $values_insert['entry_date'] =
time();
+ $values_insert['user_id']
= $this->account;
+ //FIXME
+ $values_insert['appname']
= 'property';
+ $values_insert['id'] =
$this->db->next_id('fm_responsibility_role');
+
+ $this->db->transaction_begin();
+
+ $this->db->query("INSERT INTO fm_responsibility_role ("
. implode(',',array_keys($values_insert)) . ') VALUES ('
+ .
$this->db->validate_insert(array_values($values_insert)) .
')',__LINE__,__FILE__);
+
+
+ if($this->db->transaction_commit())
+ {
+
$receipt['message'][]=array('msg'=>lang('Responsibility role has been
changed'));
+ $receipt['id']=
$values_insert['id'];//$this->db->get_last_insert_id('fm_responsibility_role',
'id');
+ }
+ else
+ {
+
$receipt['message'][]=array('msg'=>lang('Nothing changed'));
+ }
+
+ return $receipt;
+ }
+
+
public function edit_role($data)
{
$receipt = array();
Modified: branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2012-08-14 08:38:18 UTC (rev 9846)
+++ branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2012-08-14 08:42:33 UTC (rev 9847)
@@ -1249,7 +1249,21 @@
$default_value = array
('id'=>'','name'=>lang('no role'));
array_unshift
($values_combo_box[4],$default_value);
- $values_combo_box[5] =
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_READ,$this->user_id,".location.{$type_id}");
+// $values_combo_box[5] =
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_READ,$this->user_id,".location.{$type_id}");
+ $_users =
$GLOBALS['phpgw']->accounts->get_list('accounts', -1, 'ASC',
'account_lastname', '', -1);
+ $values_combo_box[5] = array();
+ foreach($_users as $_user)
+ {
+ $values_combo_box[5][] = array
+ (
+ 'id' => $_user->id,
+ 'name' => $_user->__toString(),
+
+ );
+ }
+ unset($_users);
+ unset($_user);
+
array_unshift
($values_combo_box[5],array('id'=>
(-1*$GLOBALS['phpgw_info']['user']['account_id']),'name'=>lang('mine roles')));
$default_value =
array('id'=>'','name'=>lang('no user'));
array_unshift
($values_combo_box[5],$default_value);
Modified:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_kunstoversikt_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_kunstoversikt_bkb
2012-08-14 08:38:18 UTC (rev 9846)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_kunstoversikt_bkb
2012-08-14 08:42:33 UTC (rev 9847)
@@ -173,7 +173,7 @@
}
else
{
- $ok = $this->_add_eav($id,$value_set);
+ $ok = $this->_add_sql($id,$value_set);
}
return true;
@@ -306,7 +306,7 @@
}
- private function _add_sql()
+ private function _add_sql($id,$value_set)
{
$request_ok = false;
$table = 'fm_entity_4_1';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9847] Merge 9840:9846 from trunk,
Sigurd Nes <=