[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12820] Merge 12762:12819 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12820] Merge 12762:12819 from trunk |
|
Date: |
Thu, 05 Mar 2015 08:38:58 +0000 |
Revision: 12820
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12820
Author: sigurdne
Date: 2015-03-05 08:38:58 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
Merge 12762:12819 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/templates/base/cats.xsl
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/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/phpgwapi/inc/class.xslttemplates.inc.php
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/templates/base/entity.xsl
branches/Version-1_0-branch/sms/inc/class.uisms.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/controller/inc/class.uilookup.inc.php
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,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761
+
/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,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819
Modified: branches/Version-1_0-branch/admin/templates/base/cats.xsl
===================================================================
--- branches/Version-1_0-branch/admin/templates/base/cats.xsl 2015-03-05
08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/admin/templates/base/cats.xsl 2015-03-05
08:38:58 UTC (rev 12820)
@@ -15,21 +15,21 @@
<xsl:template match="cat_list">
<center>
- <table border="0" cellspacing="2" cellpadding="2"
class="pure-table pure-table-bordered">
- <tr>
- <td colspan="5" width="100%">
- <xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- <tr>
- <td colspan="5" width="100%" align="right">
- <xsl:call-template name="search_field"/>
- </td>
- </tr>
- <xsl:apply-templates select="cat_header"/>
- <xsl:apply-templates select="cat_data"/>
- <xsl:apply-templates select="cat_add"/>
- </table>
+ <table border="0" cellspacing="2" cellpadding="2"
class="pure-table pure-table-bordered">
+ <tr>
+ <td colspan="5" width="100%">
+ <xsl:call-template
name="nextmatchs"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="5" width="100%"
align="right">
+ <xsl:call-template
name="search_field"/>
+ </td>
+ </tr>
+ <xsl:apply-templates
select="cat_header"/>
+ <xsl:apply-templates select="cat_data"/>
+ </table>
+ <xsl:apply-templates select="cat_add"/>
</center>
</xsl:template>
@@ -103,31 +103,29 @@
<!-- BEGIN cat_add -->
<xsl:template match="cat_add">
- <tr height="50" valign="bottom">
- <xsl:variable name="action_url"><xsl:value-of
select="action_url"/></xsl:variable>
- <form method="post" action="{$action_url}">
- <td colspan="2">
- <xsl:variable name="lang_add"><xsl:value-of
select="lang_add"/></xsl:variable>
- <input type="submit" name="add"
value="{$lang_add}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <xsl:variable name="action_url"><xsl:value-of
select="action_url"/></xsl:variable>
+ <form method="post" action="{$action_url}">
+ <table>
+ <tr height="50" valign="bottom">
+ <td colspan="2">
+ <xsl:variable
name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
+ <input type="submit" name="add"
value="{$lang_add}">
+ <xsl:attribute
name="title">
<xsl:value-of
select="lang_add_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- <td colspan="3" align="right">
- <xsl:variable name="lang_done"><xsl:value-of
select="lang_done"/></xsl:variable>
- <input type="submit" name="done"
value="{$lang_done}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_done_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </td>
- </form>
- </tr>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td colspan="3" align="right">
+ <xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
+ <input type="submit"
name="done" value="{$lang_done}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="lang_done_statustext"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+ </form>
</xsl:template>
<!-- END cat_list -->
@@ -135,14 +133,14 @@
<!-- BEGIN cat_edit -->
<xsl:template match="cat_edit" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="edit_url" select="edit_url"/>
+ <form method="post" action="{$edit_url}">
<table cellpadding="2" cellspacing="2" align="center">
<tr>
<td colspan="3" align="center">
<xsl:value-of select="message"/>
</td>
</tr>
- <xsl:variable name="edit_url" select="edit_url"/>
- <form method="post" action="{$edit_url}">
<tr>
<td width="23%" colspan="2">
<xsl:value-of select="lang_parent"/>
@@ -194,37 +192,31 @@
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
<xsl:variable
name="old_parent"><xsl:value-of select="old_parent"/></xsl:variable>
<input type="hidden"
name="values[old_parent]" value="{$old_parent}"/>
- <input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_save_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="submit"
name="values[save]" value="{$lang_save}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_save_statustext"/>
</xsl:attribute>
</input>
</td>
<td>
<xsl:variable name="lang_apply"
select="lang_apply"/>
- <input type="submit"
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_apply_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="submit"
name="values[apply]" value="{$lang_apply}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_apply_statustext"/>
</xsl:attribute>
</input>
</td>
<td align="right">
<xsl:variable name="lang_cancel"><xsl:value-of
select="lang_cancel"/></xsl:variable>
- <input type="submit"
name="values[cancel]" value="{$lang_cancel}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_cancel_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="submit"
name="values[cancel]" value="{$lang_cancel}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_cancel_statustext"/>
</xsl:attribute>
</input>
</td>
</tr>
- </form>
</table>
+ </form>
</xsl:template>
<xsl:template match="options">
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
---
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2015-03-05 08:35:40 UTC (rev 12819)
+++
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -84,13 +84,18 @@
$location_URL =
isset($this->config->config_data['soap_location']) &&
$this->config->config_data['soap_location'] ?
$this->config->config_data['soap_location'] :
"http://wsm01e-t.usrv.ubergenkom.no:8888/gateway/services/AltinnReporteesService";;
#A-test
-
+
+ $soap_login = $this->config->config_data['soap_login'];
+ $soap_password =
$this->config->config_data['soap_password'];
+
$client = new SoapClient(null, array(
'location' => $location_URL,
'uri' => "",
'trace' => 1,
+ 'login' => $soap_login,
+ 'password' =>
$soap_password
));
-
+
try
{
$response =
$client->__doRequest($request,$location_URL,$location_URL,1);
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -132,12 +132,12 @@
$check_list_array = array();
$sql = "SELECT DISTINCT
controller_check_list.location_code, controller_check_list.control_id,
controller_check_list.id AS check_list_id,"
- . "
procedure_id,requirement_id,costresponsibility_id,description, start_date,
end_date,deadline,planned_date, completed_date,"
+ . "
procedure_id,requirement_id,costresponsibility_id,description,
controller_control.start_date, end_date,deadline,planned_date, completed_date,"
. " control_area_id,
repeat_type,repeat_interval, title"
. " FROM controller_check_list"
. " {$this->join} controller_control ON
controller_check_list.control_id = controller_control.id"
. " {$this->join}
controller_control_location_list ON controller_control_location_list.control_id
= controller_control.id"
- . " WHERE assigned_to = {$user_id} AND status =
0";
+ . " WHERE controller_check_list.assigned_to =
{$user_id} AND status = 0";
//_debug_array($sql);
if( $repeat_type )
@@ -211,7 +211,7 @@
$sql = "SELECT DISTINCT
controller_check_list.location_code, controller_check_list.control_id,
controller_check_list.id AS check_list_id,"
- . " controller_control.description, start_date,
end_date, deadline,planned_date, completed_date,"
+ . " controller_control.description,
controller_control.start_date, end_date, deadline,planned_date, completed_date,"
. "
control_area_id,controller_check_list.location_id,title,controller_check_list.component_id"
. " FROM controller_check_list"
. " {$this->join} controller_control ON
controller_check_list.control_id = controller_control.id"
@@ -219,7 +219,7 @@
. " ON
(controller_control_component_list.control_id =
controller_check_list.control_id"
. " AND
controller_control_component_list.location_id =
controller_check_list.location_id"
. " AND
controller_control_component_list.component_id =
controller_check_list.component_id)"
- . " WHERE assigned_to = {$user_id} AND status =
0";
+ . " WHERE controller_check_list.assigned_to =
{$user_id} AND status = 0";
if( $repeat_type )
{
@@ -657,7 +657,7 @@
* @param $control_id control id
* @return array with arrays of component info
*/
- function get_components_for_control($control_id)
+ function get_components_for_control($control_id, $location_id =
0, $component_id = 0)
{
$control_id = (int) $control_id;
@@ -670,6 +670,11 @@
$sql .= "AND ccl.location_id = bim_type.location_id ";
$sql .= "AND bim_type.id = bim_item.type";
+ if($location_id && $component_id)
+ {
+ $sql .= " AND ccl.location_id = {$location_id}
AND ccl.component_id = {$component_id}";
+ }
+
$this->db->query($sql);
while($this->db->next_record())
@@ -827,6 +832,9 @@
*/
function register_control_to_component($data)
{
+ $ret = 0;
+ $assigned_to = isset($data['assigned_to']) &&
$data['assigned_to'] ? $data['assigned_to'] : null;
+ $start_date =
isset($data['start_date']) && $data['start_date'] ? $data['start_date'] : null;
$delete_component = array();
$add_component = array();
@@ -861,10 +869,18 @@
if(!$this->db->next_record())
{
- $sql = "INSERT INTO
controller_control_component_list (control_id, location_id, component_id) ";
- $sql .= "VALUES (
{$control_id}, {$location_id}, {$component_id})";
-
- $this->db->query($sql);
+ $values_insert = array
+ (
+ 'control_id'
=> $control_id,
+ 'location_id'
=> $location_id,
+ 'component_id'
=> $component_id,
+ 'assigned_to'
=> $assigned_to,
+ 'start_date'
=> $start_date
+ );
+
+ $this->db->query("INSERT INTO
controller_control_component_list (" . implode(',',array_keys($values_insert))
. ') VALUES ('
+ .
$this->db->validate_insert(array_values($values_insert)) .
')',__LINE__,__FILE__);
+ $ret = PHPGW_ACL_ADD; // Bit -
add
}
}
}
@@ -886,9 +902,11 @@
$sql = "DELETE FROM
controller_control_component_list WHERE control_id = {$control_id} AND
location_id = {$location_id} AND component_id = {$component_id}";
$this->db->query($sql);
}
+ $ret += PHPGW_ACL_DELETE; //bit - delete
}
-
- return $this->db->transaction_commit();
+
+ $this->db->transaction_commit();
+ return $ret;
}
/**
@@ -904,6 +922,64 @@
$this->db->query($sql);
}
+ /**
+ * Get all controls assosiated with a component
+ *
+ * @param array $data location_id and component_id
+ * @return array controls assosiated with a component
+ * @throws Exception if missing valid input
+ */
+ function get_controls_at_component($data)
+ {
+ if(!isset($data['location_id']) ||
!$data['location_id'])
+ {
+ throw new
Exception("controller_socontrol::get_controls_at_component - Missing
location_id in input");
+ }
+ if(!isset($data['component_id']) ||
!$data['component_id'])
+ {
+ throw new
Exception("controller_socontrol::get_controls_at_component - Missing
component_id in input");
+ }
+
+ static $users = array(); // cache result
+
+ $location_id = (int)$data['location_id'];
+ $component_id = (int)$data['component_id'];
+
+ $sql = "SELECT controller_control_component_list.* ,
controller_control.title, repeat_type, repeat_interval, enabled"
+ . " FROM controller_control_component_list"
+ . " {$this->db->join} controller_control ON
controller_control.id = controller_control_component_list.control_id WHERE
location_id = {$location_id} AND component_id = {$component_id}";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $controls = array();
+
+ while ($this->db->next_record())
+ {
+ $controls[] = array
+ (
+ 'id' =>
$this->db->f('id'),
+ 'control_id' =>
$this->db->f('control_id'),
+ 'title' =>
$this->db->f('title',true),
+ 'location_id' =>
$this->db->f('location_id'),
+ 'component_id' =>
$this->db->f('component_id'),
+ 'assigned_to' =>
$this->db->f('assigned_to'),
+ 'start_date' =>
$this->db->f('start_date'),
+ 'repeat_type' =>
$this->db->f('repeat_type'),
+ 'repeat_interval' =>
$this->db->f('repeat_interval'),
+ 'enabled' =>
$this->db->f('enabled'),
+ );
+ }
+
+ foreach($controls as &$entry)
+ {
+ if(!isset($users[$entry['assigned_to']]))
+ {
+ $users[$entry['assigned_to']] =
$GLOBALS['phpgw']->accounts->get($entry['assigned_to'])->__toString();
+ }
+ $entry['assigned_to_name'] =
$users[$entry['assigned_to']];
+ }
+ return $controls;
+
+ }
+
function get_id_field_name($extended_info = false)
{
if(!$extended_info)
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -462,6 +462,8 @@
$control_id = phpgw::get_var('control_id', 'int');
$control = $this->so_control->get_single($control_id);
$year = phpgw::get_var('year', 'int');
+ $location_id = phpgw::get_var('location_id');
+ $component_id = phpgw::get_var('component_id');
$user_id = $GLOBALS['phpgw_info']['user']['account_id'];
@@ -482,7 +484,7 @@
if (is_numeric($control_id) & $control_id > 0)
{
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
- $components_for_control_array =
$this->so_control->get_components_for_control($control_id);
+ $components_for_control_array =
$this->so_control->get_components_for_control($control_id, $location_id,
$component_id);
foreach ($locations_for_control_array as
$location)
{
$locations_list[] = array
@@ -680,9 +682,18 @@
static $_location_name = array();
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
- $year = intval(phpgw::get_var('year'));
- $month = intval(phpgw::get_var('month'));
+ if(!$year = intval(phpgw::get_var('year')))
+ {
+ $year = date('Y');
+ }
+ if(!$month = intval(phpgw::get_var('month')))
+ {
+ $month = date('m');
+ }
+ $location_id = phpgw::get_var('location_id');
+ $component_id = phpgw::get_var('component_id');
+
$user_id = $GLOBALS['phpgw_info']['user']['account_id'];
$bookmark_locations = array();
@@ -700,7 +711,7 @@
if (is_numeric($control_id) & $control_id > 0)
{
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
- $components_for_control_array =
$this->so_control->get_components_for_control($control_id);
+ $components_for_control_array =
$this->so_control->get_components_for_control($control_id, $location_id,
$component_id);
foreach ($locations_for_control_array as
$location)
{
$locations_list[] = array
Copied: branches/Version-1_0-branch/controller/inc/class.uilookup.inc.php (from
rev 12819, trunk/controller/inc/class.uilookup.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uilookup.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/class.uilookup.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -0,0 +1,301 @@
+<?php
+ /**
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package property
+ * @subpackage core
+ * @version $Id: class.uilookup.inc.php 11909 2014-04-13 16:49:53Z
sigurdne $
+ */
+
+ /**
+ * Description
+ * @package property
+ */
+ phpgw::import_class('phpgwapi.yui');
+
+ class controller_uilookup
+ {
+ var $cat_id;
+ var $start;
+ var $query;
+ var $sort;
+ var $order;
+ var $filter;
+
+ var $public_functions = array
+ (
+ 'control' => true
+ );
+
+ function __construct()
+ {
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['headonly']=true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
+
+ $this->start =
$this->bo->start;
+ $this->query =
$this->bo->query;
+ $this->sort =
$this->bo->sort;
+ $this->order =
$this->bo->order;
+ $this->filter =
$this->bo->filter;
+ $this->cat_id =
$this->bo->cat_id;
+ phpgwapi_yui::load_widget('tabview');
+ phpgwapi_yui::load_widget('dragdrop');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('tabview');
+ phpgwapi_yui::load_widget('paginator');
+ phpgwapi_yui::load_widget('animation');
+
+ if ( !isset($GLOBALS['phpgw']->css) ||
!is_object($GLOBALS['phpgw']->css) )
+ {
+ $GLOBALS['phpgw']->css =
createObject('phpgwapi.css');
+ }
+ // Prepare CSS Style
+ $GLOBALS['phpgw']->css->validate_file('datatable');
+ $GLOBALS['phpgw']->css->validate_file('property');
+
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
+
+ }
+
+ function control()
+ {
+ if( phpgw::get_var('phpgw_return_as') != 'json' )
+ {
+
+ $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction'
=> 'controller.uilookup.control',
+ 'second_display' => true,
+ 'cat_id'
=> $this->cat_id,
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter,
+ ));
+
+ $datatable['config']['allow_allrows'] = true;
+
+ $datatable['config']['base_java_url'] =
"menuaction:'controller.uilookup.control',"
+ ."second_display:true,"
+ ."cat_id:'{$this->cat_id}',"
+ ."query:'{$this->query}',"
+ ."filter:'{$this->filter}'";
+
+ $datatable['actions']['form'] = array
+ (
+ array
+ (
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+ 'menuaction'
=> 'controller.uilookup.control',
+
'second_display' => true,
+ 'cat_id'
=> $this->cat_id,
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter
+ )
+ ),
+ 'fields' => array
+ (
+ 'field' => array
+ (
+ array
+ ( //boton
SEARCH
+ 'id' =>
'btn_search',
+ 'name'
=> 'search',
+ 'value'
=> lang('search'),
+ 'type'
=> 'button',
+
'tab_index' => 2
+ ),
+ array
+ ( // TEXT IMPUT
+ 'name'
=> 'query',
+ 'id'
=> 'txt_query',
+ 'value'
=> '',//'',//$query,
+ 'type'
=> 'text',
+ 'size'
=> 28,
+
'onkeypress' => 'return pulsar(event)',
+
'tab_index' => 1
+ )
+ ),
+ 'hidden_value' => array
+ (
+ )
+ )
+ )
+ );
+ }
+
+ $uicols = array (
+ 'input_type' => array('text','text',),
+ 'name' =>
array('id','title'),
+ 'sort_field' => array('id','title'),
+ 'formatter' => array('',''),
+ 'descr' =>
array(lang('ID'),lang('title'))
+ );
+
+ $values = array();
+ $uicontrol = CreateObject('controller.uicontrol');
+
+ $_GET['startIndex'] = phpgw::get_var('start');
+ $_REQUEST['startIndex'] = phpgw::get_var('start');
+ $_GET['dir'] = phpgw::get_var('sort', 'string', 'GET',
'ASC');
+ $_REQUEST['dir'] = phpgw::get_var('sort', 'string',
'GET', 'ASC');
+ $_GET['sort'] = phpgw::get_var('order', 'string',
'GET', 'id');
+ $_REQUEST['sort'] = phpgw::get_var('order', 'string',
'GET', 'id');
+
+
+ $values = $uicontrol->query();
+
+ $json = array
+ (
+ 'recordsReturned' =>
$values['ResultSet']['recordsReturned'],
+ 'totalRecords' =>
$values['ResultSet']['totalRecords'],
+ 'startIndex' =>
$values['ResultSet']['startIndex'],
+ // 'pageSize' =>
$values['ResultSet']['pageSize'],
+ 'sort' =>
$values['ResultSet']['sortKey'],
+ 'dir' =>
$values['ResultSet']['sortDir'],
+ 'records' =>
$values['ResultSet']['Result'],
+ );
+
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
+ {
+ return $json;
+ }
+
+
+ $uicols_count = count($uicols['descr']);
+ $datatable['rowactions']['action'] = array();
+ for ($i=0;$i<$uicols_count;$i++)
+ {
+ //all colums should be have formatter
+
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
+ if($uicols['input_type'][$i]!='hidden')
+ {
+
$datatable['headers']['header'][$i]['name'] =
$uicols['name'][$i];
+
$datatable['headers']['header'][$i]['text'] =
$uicols['descr'][$i];
+
$datatable['headers']['header'][$i]['visible'] = true;
+
$datatable['headers']['header'][$i]['sortable'] = true;
+
$datatable['headers']['header'][$i]['sort_field'] =
$uicols['sort_field'][$i];
+ }
+ else
+ {
+
$datatable['headers']['header'][$i]['name'] =
$uicols['name'][$i];
+
$datatable['headers']['header'][$i]['text'] =
$uicols['descr'][$i];
+
$datatable['headers']['header'][$i]['visible'] = false;
+
$datatable['headers']['header'][$i]['sortable'] = false;
+
$datatable['headers']['header'][$i]['format'] = 'hidden';
+ }
+ }
+
+ $function_exchange_values = '';
+
+ $function_exchange_values .=
'opener.document.getElementById("control_id").value = "";' ."\r\n";
+ $function_exchange_values .=
'opener.document.getElementById("control_name").value = "";' ."\r\n";
+
+ $function_exchange_values .=
'opener.document.getElementById("control_id").value = data.getData("id");'
."\r\n";
+ $function_exchange_values .=
'opener.document.getElementById("control_name").value = data.getData("title");'
."\r\n";
+
+ $function_exchange_values .= 'window.close()';
+
+ $datatable['exchange_values'] =
$function_exchange_values;
+ $datatable['valida'] = '';
+
+ // path for property.js
+ $property_js = "/property/js/yahoo/property.js";
+
+ if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
+ $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ }
+
+ $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+
+ // Pagination and sort values
+ $datatable['pagination']['records_start'] =
(int)phpgw::get_var('start');
+ $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $datatable['pagination']['records_returned']=
$values['ResultSet']['recordsReturned'];
+ $datatable['pagination']['records_total'] =
$values['ResultSet']['totalRecords'];
+
+ if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
+ {
+ $datatable['sorting']['order']
= 'id'; // name key Column in myColumnDef
+ $datatable['sorting']['sort']
= 'asc'; // ASC / DESC
+ }
+ else
+ {
+ $datatable['sorting']['order']
= phpgw::get_var('sort', 'string'); // name of column of Database
+ $datatable['sorting']['sort']
= phpgw::get_var('dir', 'string'); // ASC / DESC
+ }
+
+ $appname
= lang('controller');
+ $function_msg = '';
+
+
+ //-- BEGIN----------------------------- JSON CODE
------------------------------
+
+ //values for Pagination
+ $json = array
+ (
+ 'recordsReturned' =>
$datatable['pagination']['records_returned'],
+ 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
+ 'startIndex' =>
$datatable['pagination']['records_start'],
+ 'sort' =>
$datatable['sorting']['order'],
+ 'dir' =>
$datatable['sorting']['sort'],
+ 'records' =>
array()
+ );
+
+
+ // right in datatable
+ if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
+ {
+ $json ['rights'] =
$datatable['rowactions']['action'];
+ }
+
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
+ {
+ return $json;
+ }
+
+
+ $datatable['json_data'] = json_encode($json);
+ //-------------------- JSON CODE ----------------------
+
+ // Prepare template variables and process XSLT
+ $template_vars = array();
+ $template_vars['datatable'] = $datatable;
+
$GLOBALS['phpgw']->xslttpl->add_file(array('datatable'));
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
$template_vars);
+
+ //Title of Page
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . ' - ' . $appname . ': ' . $function_msg;
+
+ // Prepare generic YUI Library for old style lookup
+ $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.tenant.index', 'property' );
+ }
+ }
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2015-03-05
08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2015-03-05
08:38:58 UTC (rev 12820)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.48';
+ $setup_info['controller']['version'] = '0.1.49';
$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
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -143,10 +143,12 @@
),
'controller_control_component_list' => array(
'fd' => array(
- 'id'
=> array('type' => 'auto', 'nullable' => false),
+ 'id' =>
array('type' => 'auto', 'nullable' => false),
'control_id' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
- 'location_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => false),
- 'component_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => false)
+ 'location_id' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
+ 'component_id' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
+ 'assigned_to' => array('type'
=> 'int', 'precision' => '4', 'nullable' => true),
+ 'start_date' => array('type'
=> 'int', 'precision' => '4', 'nullable' => true),
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -965,3 +965,29 @@
}
}
+ /**
+ * Assign responsible user to control at componant from date.
+ **/
+ $test[] = '0.1.48';
+ function controller_upgrade0_1_48()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_control_component_list','assigned_to',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => true
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_control_component_list','start_date',array(
+ 'type' => 'int',
+ 'precision' => '8',
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['controller']['currentver'] =
'0.1.49';
+ return
$GLOBALS['setup_info']['controller']['currentver'];
+ }
+ }
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.xslttemplates.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -394,6 +394,7 @@
$xsl->loadXML($this->xsldata);
// Configure the transformer
+ libxml_use_internal_errors(true);
$proc = new XSLTProcessor;
$proc->registerPHPFunctions();
$proc->importStyleSheet($xsl); // attach the xsl rules
@@ -415,7 +416,10 @@
echo '<div class="error">';
echo $message;
echo '</div>';
- _debug_array(libxml_get_last_error());
+ $errors = libxml_get_errors();
+ _debug_array($errors);
+ libxml_clear_errors();
+
echo "<h2>xml-data</h2>";
$this->list_lineno($this->xmldata,
true);
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -60,7 +60,8 @@
'read_single' => true,
'save' => true,
'delete' => true,
- 'check_perms' => true
+ 'check_perms' => true,
+ 'add_control' => true
);
var $type_app = array();
@@ -900,4 +901,127 @@
return $this->so->edit_inventory($values);
}
+ public function add_control()
+ {
+ $entity_id =
phpgw::get_var('entity_id', 'int');
+ $cat_id =
phpgw::get_var('cat_id', 'int');
+ $id =
phpgw::get_var('id', 'int');
+ $type =
phpgw::get_var('type', 'string', 'REQUEST', 'entity');
+ $control_id =
phpgw::get_var('control_id', 'int');
+ $assigned_to =
phpgw::get_var('control_responsible', 'int');
+ $start_date =
phpgw::get_var('control_start_date', 'string');
+
+ $component_arr =
$this->so->read_single(array('entity_id' => $entity_id, 'cat_id'=> $cat_id,
'id' => $id));
+
+ $location_code = $component_arr['location_code'];
+
+ if($start_date)
+ {
+ phpgw::import_class('phpgwapi.datetime');
+ $start_date =
phpgwapi_datetime::date_to_timestamp($start_date);
+ }
+
+ $result = array
+ (
+ 'status_kode'=> 'error',
+ 'status' => lang('error'),
+ 'msg' => lang('Missing input')
+ );
+
+ if($control_id && $assigned_to && $id)
+ {
+ if(!$GLOBALS['phpgw']->acl->check('.admin',
PHPGW_ACL_EDIT, 'property'))
+ {
+ $receipt['error'][]=true;
+ $result = array
+ (
+ 'status_kode'=> 'error',
+ 'status' =>
lang('error'),
+ 'msg' => lang('you
are not approved for this task')
+ );
+
+ }
+ if(!$receipt['error'])
+ {
+ $location_id =
$GLOBALS['phpgw']->locations->get_id( $this->type_app[$type],
".{$type}.{$entity_id}.{$cat_id}");
+
+ $so_control =
CreateObject('controller.socontrol');
+ $values = array
+ (
+ 'register_component' =>
array("{$control_id}_{$location_id}_{$id}"),
+ 'assigned_to'
=> $assigned_to,
+ 'start_date'
=> $start_date
+ );
+
+ if($add =
$so_control->register_control_to_component($values))
+ {
+ if($add == PHPGW_ACL_ADD)
+ {
+
$this->add_check_list(array('location_id'=>$location_id, 'component_id' => $id,
'control_id' => $control_id, 'assigned_to' => $assigned_to, 'start_date' =>
$start_date, 'location_code' => $location_code));
+ }
+
+ $result = array
+ (
+ 'status_kode'=> 'ok',
+ 'status' => 'Ok',
+ 'msg' =>
lang('updated')
+
+ );
+ }
+ else
+ {
+ $result = array
+ (
+ 'status_kode'=> 'error',
+ 'status' =>
lang('error'),
+ 'msg' => 'Noe
gikk galt'
+ );
+ }
+ }
+ }
+ return $result;
+ }
+
+ function add_check_list($data = array())
+ {
+ phpgw::import_class('controller.socheck_list');
+ include_class('controller', 'check_list', 'inc/model/');
+
+ $control_id = $data['control_id'];
+ $type = 'component';
+ $comment = '';
+ $assigned_to = $data['assigned_to'];
+ $billable_hours = phpgw::get_var('billable_hours',
'float');
+
+ $deadline_date_ts = $data['start_date'];
+ $planned_date_ts = $deadline_date_ts;
+ $completed_date_ts = 0;
+
+ $check_list = new controller_check_list();
+ $check_list->set_control_id($control_id);
+ $check_list->set_location_code($data['location_code']);
+ $check_list->set_location_id($data['location_id']);
+ $check_list->set_component_id($data['component_id']);
+
+ $status = controller_check_list::STATUS_NOT_DONE;
+ $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->set_assigned_to($assigned_to);
+ $check_list->set_billable_hours($billable_hours);
+
+ $socheck_list = CreateObject('controller.socheck_list');
+
+ if($check_list->validate() && $check_list_id =
$socheck_list->store($check_list))
+ {
+ return $check_list_id ;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
}
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2015-03-05 08:38:58 UTC (rev 12820)
@@ -69,7 +69,8 @@
'get_inventory' => true,
'add_inventory' => true,
'edit_inventory' => true,
- 'inventory_calendar'=> true
+ 'inventory_calendar'=> true,
+ 'get_controls_at_component'=>true
);
function property_uientity()
@@ -1955,6 +1956,13 @@
$active_tab = $active_tab ? $active_tab
: 'location';
}
+ if(true)
+ {
+ $tabs['controller'] = array('label'
=> lang('controller'), 'link' => '#controller', 'function' =>
"set_tab('controller')");
+ $active_tab = $active_tab ? $active_tab
: 'location';
+
$GLOBALS['phpgw']->jqcal->add_listener('control_start_date');
+ }
+
$location =
".{$this->type}.{$this->entity_id}.{$this->cat_id}";
$attributes_groups =
$this->bo->get_attribute_groups($location, $values['attributes']);
@@ -2275,54 +2283,7 @@
}
}
-
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
- {
- $lang_controller =
$GLOBALS['phpgw']->translation->translate('controller', array(),false ,
'controller');
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
- $socase =
CreateObject('controller.socase');
- $controller_cases =
$socase->get_cases_by_component($location_id, $id);
-
- $_statustext = array();
- $_statustext[0] = lang('open');
- $_statustext[1] = lang('closed');
- $_statustext[2] = lang('pending');
- }
-
- foreach ($controller_cases as $case)
- {
- switch ($case['status'])
- {
- case 0:
- case 2:
- $_method =
'view_open_cases';
- break;
- case 1:
- $_method =
'view_closed_cases';
- break;
- default:
- $_method =
'view_open_cases';
- }
-
- $_link =
$GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction' =>
"controller.uicase.{$_method}",
- 'check_list_id' =>
$case['check_list_id']
- )
- );
-
- $_target[] = array
- (
- 'url' => "<a
href=\"{$_link}\" > {$case['check_list_id']}</a>",
- 'type' =>
$lang_controller,
- 'title' =>
$case['descr'],
- 'status' =>
$_statustext[$case['status']],
- 'user' =>
$GLOBALS['phpgw']->accounts->get($case['user_id'])->__toString(),
- 'entry_date'=>
$GLOBALS['phpgw']->common->show_date($case['modified_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
- );
- unset($_link);
- }
-
$related =
$this->bo->read_entity_to_link(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'id'=>$id));
$_related = array();
@@ -2384,7 +2345,7 @@
);
- if($category['enable_bulk'])
+// if($category['enable_bulk'])
{
$tabs['inventory'] = array('label'
=> lang('inventory'), 'link' => '#inventory', 'function' =>
"set_tab('inventory')");
@@ -2423,6 +2384,120 @@
}
+
if(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
+ {
+ $_controls =
$this->get_controls_at_component($location_id, $id);
+
+ $datavalues[4] = array
+ (
+ 'name'
=> "4",
+ 'values'
=> json_encode($_controls),
+ 'total_records'
=> count($_controls),
+ 'edit_action'
=> "''",
+ 'is_paginator'
=> 0,
+ 'footer'
=> 1
+ );
+
+ $myColumnDefs[4] = array
+ (
+ 'name' => "4",
+ 'values' =>
json_encode(array(
+ array('key' =>
'control_id','label'=>lang('id'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'assigned_to_name','label'=>lang('user'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'start_date','label'=>lang('start date'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'repeat_type','label'=>lang('repeat
type'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'repeat_interval','label'=>lang('repeat
interval'),'sortable'=>false,'resizeable'=>true),
+ // array('key' =>
'enabled','label'=>lang('enabled'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'location_id','hidden'=>true),
+ array('key' =>
'component_id','hidden'=>true),
+ array('key' =>
'id','hidden'=>true),
+ array('key' =>
'assigned_to','hidden'=>true),
+ )
+ )
+ );
+
+ $lang_controller =
$GLOBALS['phpgw']->translation->translate('controller', array(),false ,
'controller');
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
+ $socase =
CreateObject('controller.socase');
+ $controller_cases =
$socase->get_cases_by_component($location_id, $id);
+ $_statustext = array();
+ $_statustext[0] = lang('open');
+ $_statustext[1] = lang('closed');
+ $_statustext[2] = lang('pending');
+
+ $_cases = array();
+ foreach ($controller_cases as $case)
+ {
+ $socheck_list =
CreateObject('controller.socheck_list');
+ $control_id =
$socheck_list->get_single($case['check_list_id'])->get_control_id();
+ foreach($_controls as $_control)
+ {
+
if($_control['control_id'] == $control_id)
+ {
+ $_control_name
= $_control['title'];
+ break;
+ }
+ }
+// _debug_array($check_list);die();
+
+ switch ($case['status'])
+ {
+ case 0:
+ case 2:
+ $_method =
'view_open_cases';
+ break;
+ case 1:
+ $_method =
'view_closed_cases';
+ break;
+ default:
+ $_method =
'view_open_cases';
+ }
+
+ $_link =
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
"controller.uicase.{$_method}",
+ 'check_list_id'
=> $case['check_list_id']
+ )
+ );
+
+ $_cases[] = array
+ (
+ 'url' => "<a
href=\"{$_link}\" > {$case['check_list_id']}</a>",
+ 'type' =>
$_control_name,
+ 'title' =>
$case['descr'],
+ 'status' =>
$_statustext[$case['status']],
+ 'user' =>
$GLOBALS['phpgw']->accounts->get($case['user_id'])->__toString(),
+ 'entry_date'=>
$GLOBALS['phpgw']->common->show_date($case['modified_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
+ );
+ unset($_link);
+ }
+
+ $datavalues[5] = array
+ (
+ 'name'
=> "5",
+ 'values'
=> json_encode($_cases),
+ 'total_records'
=> count($_cases),
+ 'edit_action'
=> "''",
+ 'is_paginator'
=> 1,
+ 'footer'
=> 0
+ );
+
+ $myColumnDefs[5] = array
+ (
+ 'name' => "5",
+ 'values' =>
json_encode(array(
+ array('key' =>
'url','label'=>lang('id'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
+ array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'status','label'=>lang('status'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'user','label'=>lang('user'),'sortable'=>true,'resizeable'=>true),
+ array('key' =>
'entry_date','label'=>lang('entry date'),'sortable'=>false,'resizeable'=>true),
+ )
+ )
+ );
+
+ }
}
$property_js = "/property/js/yahoo/property2.js";
@@ -2452,6 +2527,7 @@
$data = array
(
+ 'controller'
=> true,
'property_js'
=> json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] .
$property_js),
'datatable'
=> $datavalues,
'myColumnDefs'
=> $myColumnDefs,
@@ -3434,4 +3510,67 @@
echo "Planlagt: Visning av kalenderoppføringer for
ressursen";
$GLOBALS['phpgw']->common->phpgw_exit();
}
+
+ public function get_controls_at_component( $location_id = 0,
$id = 0 )
+ {
+ if(!$location_id)
+ {
+ $entity_id =
phpgw::get_var('entity_id', 'int');
+ $cat_id =
phpgw::get_var('cat_id', 'int');
+ $type =
phpgw::get_var('type', 'string', 'REQUEST', 'entity');
+
+ $location_id =
$GLOBALS['phpgw']->locations->get_id( $this->type_app[$type],
".{$type}.{$entity_id}.{$cat_id}");
+ }
+
+ $id = $id ? $id :
phpgw::get_var('id', 'int');
+
+ if(!$this->acl_read)
+ {
+ echo lang('No Access');
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ $repeat_type_array = array
+ (
+ "0"=> lang('day'),
+ "1"=> lang('week'),
+ "2"=> lang('month'),
+ "3"=> lang('year')
+ );
+
+ $control_link_data = array
+ (
+ 'menuaction' =>
'controller.uicalendar.view_calendar_year_for_locations',
+ 'control_id' => $entry['control_id'],
+ 'location_id' => $location_id,
+ 'component_id' => $id,
+ );
+
+ $controls =
execMethod('controller.socontrol.get_controls_at_component',
array('location_id' => $location_id, 'component_id' => $id));
+ foreach($controls as &$entry)
+ {
+ $menuaction =
'controller.uicalendar.view_calendar_year_for_locations';
+ if($entry['repeat_type'] < 2)
+ {
+ $menuaction =
'controller.uicalendar.view_calendar_month_for_locations';
+ }
+
+ $control_link_data = array
+ (
+ 'menuaction' => $menuaction,
+ 'control_id' => $entry['control_id'],
+ 'location_id' => $location_id,
+ 'component_id' => $id,
+ );
+ $entry['title'] = '<a
href="'.$GLOBALS['phpgw']->link('/index.php',$control_link_data).'"
target="_blank">'.$entry['title'].'</a>';
+
+ $entry['start_date'] =
$GLOBALS['phpgw']->common->show_date($entry['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $entry['repeat_type'] =
$repeat_type_array[$entry['repeat_type']];
+ }
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
+ {
+ return json_encode($controls);
+ }
+ return $controls;
+ }
}
Modified: branches/Version-1_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/entity.xsl
2015-03-05 08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/property/templates/base/entity.xsl
2015-03-05 08:38:58 UTC (rev 12820)
@@ -527,7 +527,7 @@
</td>
<td>
<xsl:value-of select="value_num"/>
- <input
type="hidden" name="location_code" value="{location_code}"/>
+ <input
type="hidden" id="location_code" name="location_code" value="{location_code}"/>
<input
type="hidden" name="lookup_tenant" value="{lookup_tenant}"/>
<input
type="hidden" name="values[id]" value="{value_id}"/>
<input
type="hidden" name="values[num]" value="{value_num}"/>
@@ -624,6 +624,163 @@
</div>
</xsl:when>
</xsl:choose>
+ <xsl:if test="controller!=''">
+ <div id="controller">
+ <script
type="text/javascript">
+
lookup_control_responsible = function()
+ {
+ var oArgs =
{menuaction:'property.uilookup.phpgw_user', column:'control_responsible'};
+ var requestUrl
= phpGWLink('index.php', oArgs);
+ var
Window1=window.open(requestUrl,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ }
+
+ lookup_control =
function()
+ {
+ var oArgs =
{menuaction:'controller.uilookup.control'};
+ var requestUrl
= phpGWLink('index.php', oArgs);
+ var
Window1=window.open(requestUrl,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ }
+<![CDATA[
+ function parseURL(url)
+ {
+ var parser =
document.createElement('a'),
+
searchObject = {},
+
queries, split, i;
+ // Let the
browser do the work
+ parser.href =
url;
+ // Convert
query string to object
+ queries =
parser.search.replace(/^\?/, '').split('&');
+ for( i = 0; i <
queries.length; i++ ) {
+ split =
queries[i].split('=');
+
searchObject[split[0]] = split[1];
+ }
+ return {
+
protocol: parser.protocol,
+ host:
parser.host,
+
hostname: parser.hostname,
+ port:
parser.port,
+
pathname: parser.pathname,
+ search:
parser.search,
+
searchObject: searchObject,
+ hash:
parser.hash
+ };
+ }
+]]>
+ add_control = function()
+ {
+ var formUrl =
$("#form").attr("action");
+ var Url =
parseURL(formUrl);
+ oArgs =
Url.searchObject;
+ delete
oArgs.click_history;
+
oArgs.menuaction = 'property.boentity.add_control';
+
oArgs.control_id = $("#control_id").val();
+
oArgs.control_responsible = $("#control_responsible").val();
+
oArgs.control_start_date = $("#control_start_date").val();
+
+ var requestUrl
= phpGWLink('index.php', oArgs, true);
+//
alert(requestUrl);
+
+
$("#controller_receipt").html("");
+
+ $.ajax({
+ type:
'POST',
+
dataType: 'json',
+ url:
requestUrl,
+
success: function(data) {
+
if( data != null)
+
{
+
$("#controller_receipt").html(data.status + '::' + data.msg);
+
if(data.status_kode == 'ok')
+
{
+
$("#control_id").val('');
+
$("#control_name").val('');
+
$("#control_responsible").val('');
+
$("#control_responsible_user_name").val('');
+
$("#control_start_date").val('');
+
}
+
}
+ }
+ });
+
+ var oArgs2 =
{menuaction:'property.uientity.get_controls_at_component', type:oArgs.type,
entity_id:oArgs.entity_id, cat_id:oArgs.cat_id, id: oArgs.id};
+ var requestUrl2
= phpGWLink('index.php', oArgs2, true);
+
execute_async(myDataTable_4, oArgs2);
+ };
+
+ </script>
+ <div
id="controller_receipt"></div>
+ <fieldset>
+ <legend>
+
<xsl:value-of select="php:function('lang', 'new')" />
+ </legend>
+ <label>
+
<xsl:value-of select="php:function('lang', 'user')" />
+ </label>
+ <input
type="text" name="control_responsible" id="control_responsible" value=""
onClick="lookup_control_responsible();" readonly="readonly" size="6">
+ </input>
+ <input
size="30" type="text" name="control_responsible_user_name"
id="control_responsible_user_name" value=""
onClick="lookup_control_responsible();" readonly="readonly">
+ </input>
+ <br/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'controller')" />
+ </label>
+ <input
type="text" name="control_id" id="control_id" value=""
onClick="lookup_control();" readonly="readonly" size="6">
+ </input>
+ <input
type="text" name="control_name" id="control_name" value=""
onClick="lookup_control();" readonly="readonly" size="30">
+ </input>
+ <xsl:variable
name="lang_add">
+
<xsl:value-of select="php:function('lang', 'add')"/>
+ </xsl:variable>
+ <br/>
+
+ <label>
+
<xsl:value-of select="php:function('lang', 'start date')" />
+ </label>
+ <input
type="text" name="control_start_date" id="control_start_date" value=""
readonly="readonly" size="10">
+ </input>
+ <br/>
+
+ <input
type="button" name="" value="{$lang_add}" title="{$lang_add}"
onClick="add_control();">
+ </input>
+
+ </fieldset>
+ <table>
+ <tr>
+ <td>
+
<xsl:value-of select="php:function('lang', 'controller')" />
+
+ </td>
+ <td>
+ <table
cellpadding="2" cellspacing="2" width="80%" align="center">
+ <tr>
+
<td>
+
<div id="datatable-container_4"/>
+
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<xsl:value-of select="php:function('lang', 'cases')" />
+ </td>
+ <td>
+ <table
cellpadding="2" cellspacing="2" width="80%" align="center">
+ <tr>
+
<td>
+
<div id="datatable-container_5"/>
+
</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ <xsl:call-template
name="controller_integration">
+ <xsl:with-param
name="controller" select ='controller'/>
+ </xsl:call-template>
+ </div>
+ </xsl:if>
<xsl:call-template
name="attributes_values"/>
<xsl:choose>
<xsl:when test="files!='' or
fileupload = 1">
@@ -946,3 +1103,8 @@
</xsl:when>
</xsl:choose>
</xsl:template>
+
+ <xsl:template name="controller_integration">
+ <xsl:param name="controller" />
+
+ </xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/sms/inc/class.uisms.inc.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/class.uisms.inc.php 2015-03-05
08:35:40 UTC (rev 12819)
+++ branches/Version-1_0-branch/sms/inc/class.uisms.inc.php 2015-03-05
08:38:58 UTC (rev 12820)
@@ -855,7 +855,11 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
- function daemon_manual()
+ /**
+ * @param mixed $data
+ * If $data is an array - then the process is run as cron
+ */
+ function daemon_manual($data=array())
{
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
'admin::sms::refresh';
if(!$this->acl->check('run', PHPGW_ACL_READ,'admin'))
@@ -864,12 +868,16 @@
return;
}
- $GLOBALS['phpgw']->xslttpl->add_file(array('sms'));
-
$sms = CreateObject('sms.sms');
$sms->getsmsinbox(true);
$sms->getsmsstatus();
+ if(isset($data['cron']))
+ {
+ return;
+ }
+ $GLOBALS['phpgw']->xslttpl->add_file(array('sms'));
+
$receipt['message'][]=array('msg'=>lang('Daemon
refreshed'));
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12820] Merge 12762:12819 from trunk,
Sigurd Nes <=