[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13432] Merge 13417:13431 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13432] Merge 13417:13431 from trunk |
Date: |
Mon, 15 Jun 2015 07:09:02 +0000 |
Revision: 13432
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13432
Author: sigurdne
Date: 2015-06-15 07:09:00 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
Merge 13417:13431 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/templates/base/custom.xsl
branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicomponent.inc.php
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
branches/Version-1_0-branch/controller/js/controller/check_list_update_status.js
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
branches/Version-1_0-branch/controller/templates/base/component.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.cache.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune:12743-12875,12986
/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,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416
+ /branches/stavangerkommune:12743-12875,12986
/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,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431
Modified: branches/Version-1_0-branch/admin/templates/base/custom.xsl
===================================================================
--- branches/Version-1_0-branch/admin/templates/base/custom.xsl 2015-06-14
17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/admin/templates/base/custom.xsl 2015-06-15
07:09:00 UTC (rev 13432)
@@ -636,7 +636,8 @@
<xsl:template match="edit_custom_function"
xmlns:php="http://php.net/xsl">
<div align="left">
-
+
+ <form method="post" action="{form_action}">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -647,8 +648,6 @@
</tr>
</xsl:when>
</xsl:choose>
-
- <form method="post" action="{form_action}">
<tr>
<td class="th_text" align="left">
@@ -778,8 +777,9 @@
</input>
</td>
</tr>
-
- </form>
+ </table>
+ </form>
+ <table cellpadding="2" cellspacing="2" width="80%"
align="center">
<tr>
<td>
<xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -525,6 +525,8 @@
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
$component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
@@ -728,6 +730,8 @@
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
$component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
@@ -901,6 +905,8 @@
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
$component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
@@ -1006,6 +1012,8 @@
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
$component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -276,6 +276,8 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code($component_arr['location_code']);
$component->set_xml_short_desc($short_desc);
@@ -291,13 +293,16 @@
$control =
$this->so_control->get_single($check_list->get_control_id());
- $responsible_user_id =
execMethod('property.soresponsible.get_responsible_user_id',
+ if(!$responsible_user_id =
phpgw::get_var('assigned_to', 'int'))
+ {
+ $responsible_user_id =
execMethod('property.soresponsible.get_responsible_user_id',
array
(
'responsibility_id' =>
$control->get_responsibility_id(),
'location_code' =>
$location_code
)
);
+ }
$year = date("Y", $deadline_ts);
$month_nr = date("n", $deadline_ts);
@@ -379,6 +384,8 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code($component_arr['location_code']);
$component->set_xml_short_desc($short_desc);
$component_array = $component->toArray();
@@ -709,6 +716,8 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
$component = new controller_component();
+ $component->set_id($component_id);
+ $component->set_location_id($location_id);
$component->set_location_code($component_arr['location_code']);
$component->set_xml_short_desc($short_desc);
$component_array = $component->toArray();
@@ -879,7 +888,7 @@
{
if(!$this->add && !$this->edit)
{
- return json_encode( array( "status" =>
'not_saved') );
+ return json_encode( array( "status" =>
'not_saved', 'message' => '') );
}
$check_list_id = phpgw::get_var('check_list_id');
@@ -888,7 +897,23 @@
$check_list = $this->so->get_single($check_list_id);
if ( !$this->_check_for_required($check_list) )
{
- return json_encode( array( "status" =>
'not_saved') );
+ $messages = phpgwapi_cache::message_get(true);
+ $message = '';
+ foreach($messages as $_type => $_message)
+ {
+ if($_type == 'error')
+ {
+ foreach($_message as $__message)
+ {
+ // $message.=
strip_tags($__message['msg']);
+ $message.=
preg_replace("/<\/br[^>]*>\s*\r*\n*/is", "\n", $__message['msg']);
+
+ }
+ }
+
+ }
+ return json_encode( array( "status" =>
'not_saved', 'message' => $message) );
+
}
if($check_list_status ==
controller_check_list::STATUS_DONE)
@@ -909,7 +934,7 @@
}
else
{
- return json_encode( array( "status" =>
'not_saved') );
+ return json_encode( array( "status" =>
'not_saved', 'message' => '') );
}
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicomponent.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicomponent.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/controller/inc/class.uicomponent.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -195,11 +195,19 @@
'selected' => $_year == $year ? 1
: 0
);
}
-
+ $status_list = array(
+ array('id' => '', 'name' => lang('select
value')),
+ array('id' => 'not_performed', 'name' =>
lang('status not done')),
+ array('id' => 'done_with_open_deviation',
'name' => lang('done with open deviation')),
+ );
$location_filter = $this->get_location_filter();
array_unshift($location_filter, array('id' => '',
'name' => lang('select value')));
-
+ $filter_component = '';
+ if(phpgw::get_var('component_id', 'int'))
+ {
+ $filter_component =
phpgw::get_var('location_id', 'int') . '_' . phpgw::get_var('component_id',
'int');
+ }
$data = array(
'datatable_name' => lang('status components'),
'form' => array(
@@ -243,29 +251,45 @@
'list' =>
$year_list,
'onchange'
=> 'update_table();'
),
+ array('type' =>
'filter',
+ 'name' =>
'status',
+ 'text' =>
lang('status'),
+ 'list' =>
$status_list,
+ 'onchange'
=> 'update_table();'
+ ),
array('type' =>
'checkbox',
'name' =>
'all_items',
'text' =>
'List uten kontroller',
'value' => 1,
'onclick'
=> 'update_table();'
),
+ array('type' =>
'hidden',
+ 'name' =>
'filter_component',
+ 'text' => '',
+ 'value' =>
$filter_component
+ ),
),
),
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'controller.uicomponent.index',
'phpgw_return_as' => 'json')),
- 'field' => $this->get_fields(),
+ 'field' =>
$this->get_fields($filter_component),
),
);
self::render_template_xsl(array('component'), $data);
}
- private function get_fields()
+ private function get_fields($filter_component = '')
{
$fields = array
(
array(
+ 'key' => 'selected',
+ 'label' => '',
+ 'sortable' => false,
+ ),
+ array(
'key' => 'component_id',
'label' => lang('component'),
'sortable' => true,
@@ -282,65 +306,66 @@
),
array(
'key' => '1',
- 'label' => lang('month 1'),
+ 'label' => lang('short_month 1
capitalized'),
'sortable' => true,
),
array(
'key' => '2',
- 'label' => lang('month 2'),
+ 'label' => lang('short_month 2
capitalized'),
'sortable' => true,
),
array(
'key' => '3',
- 'label' => lang('month 3'),
+ 'label' => lang('short_month 3
capitalized'),
'sortable' => true,
),
array(
'key' => '4',
- 'label' => lang('month 4'),
+ 'label' => lang('short_month 4
capitalized'),
'sortable' => true,
),
array(
'key' => '5',
- 'label' => lang('month 5'),
+ 'label' => lang('short_month 5
capitalized'),
'sortable' => true,
),
array(
'key' => '6',
- 'label' => lang('month 6'),
+ 'label' => lang('short_month 6
capitalized'),
'sortable' => true,
),
array(
'key' => '7',
- 'label' => lang('month 7'),
+ 'label' => lang('short_month 7
capitalized'),
'sortable' => true,
),
array(
'key' => '8',
- 'label' => lang('month 8'),
+ 'label' => lang('short_month 8
capitalized'),
'sortable' => true,
),
array(
'key' => '9',
- 'label' => lang('month 9'),
+ 'label' => lang('short_month 9
capitalized'),
'sortable' => true,
),
array(
'key' => '10',
- 'label' => lang('month 10'),
+ 'label' => lang('short_month
10 capitalized'),
'sortable' => true,
),
array(
'key' => '11',
- 'label' => lang('month 11'),
+ 'label' => lang('short_month
11 capitalized'),
'sortable' => true,
),
array(
'key' => '12',
- 'label' => lang('month 12'),
+ 'label' => lang('short_month
12 capitalized'),
'sortable' => true,
),
);
+
return $fields;
}
@@ -354,6 +379,13 @@
$query = phpgw::get_var('query', 'string');
$year = phpgw::get_var('year', 'int');
$all_items = phpgw::get_var('all_items', 'bool');
+ $filter_status = phpgw::get_var('status', 'string');
+ if($filter_component_str =
phpgw::get_var('filter_component', 'string'))
+ {
+ $filter_component_arr = explode('_',
$filter_component_str);
+ $location_id = $filter_component_arr[0];
+ $filter_component = $filter_component_arr[1];
+ }
$so_control =
CreateObject('controller.socontrol');
$this->so =
CreateObject('controller.socheck_list');
@@ -405,12 +437,13 @@
$exclude_locations[] = $_location_id;
$_components =
execMethod('property.soentity.read',array(
- 'filter_entity_group' =>
$entity_group_id,
- 'location_id' => $_location_id,
- 'district_id' => $district_id,
- 'allrows' => true,
- 'control_registered' =>
!$all_items,
- 'check_for_control' => true
+ 'filter_entity_group'
=> $entity_group_id,
+ 'location_id'
=> $_location_id,
+ 'district_id'
=> $district_id,
+ 'allrows'
=> true,
+ 'control_registered'
=> !$all_items,
+ 'check_for_control'
=> true,
+ 'filter_item'
=> $filter_component
)
);
$components = array_merge($components,
$_components);
@@ -461,9 +494,10 @@
$control
= $so_control->get_single($_control['control_id']);
// one for each serie
$components_for_control_array =
$so_control->get_components_for_control($control_id, $location_id,
$component_id,0);//,$user_id);
+ $repeat_type
= $control->get_repeat_type();
// LOCATIONS: Process aggregated values
for controls with repeat type day or week
- if($control->get_repeat_type() <=
controller_control::REPEAT_TYPE_WEEK)
+ if($repeat_type <=
controller_control::REPEAT_TYPE_WEEK)
{
// COMPONENTS: Process
aggregated values for controls with repeat type day or week
@@ -471,7 +505,6 @@
{
$component->set_xml_short_desc("
{$location_type_name[$location_id]}</br>{$short_description}");
- $repeat_type
= $control->get_repeat_type();
$component_with_check_lists =
$this->so->get_check_lists_for_control_and_component($control_id,
$component->get_location_id(), $component->get_id(), $from_date_ts,
$to_date_ts, $repeat_type);
$cl_criteria = new
controller_check_list();
@@ -492,13 +525,13 @@
}
}
// Process values for controls with
repeat type month or year
- else if($control->get_repeat_type() >
controller_control::REPEAT_TYPE_WEEK)
+ else if($repeat_type >
controller_control::REPEAT_TYPE_WEEK)
{
foreach($components_for_control_array as $component)
{
+
$component->set_xml_short_desc("
{$location_type_name[$location_id]}</br>{$short_description}");
- $repeat_type
= $control->get_repeat_type();
$component_with_check_lists =
$this->so->get_check_lists_for_control_and_component($control_id,
$component->get_location_id(), $component->get_id(), $from_date_ts,
$to_date_ts, $repeat_type);// ,$user_id);
$check_lists_array =
$component_with_check_lists["check_lists_array"];
@@ -591,6 +624,7 @@
{
if($calendar)
{
+ $repeat_type =
$calendar['info']['repeat_type'] ? (int)$calendar['info']['repeat_type'] :
$repeat_type;
$calendar['info']['service_time'] = $calendar['info']['service_time'] ?
$calendar['info']['service_time'] : $service_time;
$calendar['info']['controle_time'] = $calendar['info']['controle_time'] ?
$calendar['info']['controle_time'] : $controle_time;
$_data[$month][$repeat_type] = $calendar;
@@ -658,13 +692,22 @@
if(!isset($entry['missing_control']))
{
+ if($filter_component_str)
+ {
+ $row['selected'] = '<input
id="selected_component" type="checkbox" name="selected_component" checked =
"checked" onclick="deselect_component();">';
+ }
+ else
+ {
+ $row['selected'] = '';
+ }
$row['year'] = $year;
$row['descr'] =
"Frekvens<br/>Status<br/>Utførende<br/>Tidsbruk";
}
+ $found_at_least_one = false;
for ( $_month=1; $_month < 13; $_month++ )
{
- $row[$_month] =
$this->translate_calendar_info($entry[$_month],$year, $_month);
+ $row[$_month] =
$this->translate_calendar_info($entry[$_month],$year, $_month, $filter_status,
$found_at_least_one);
if( !$user_id ||
$entry[$_month]['info']['assigned_to'] == $user_id)
{
$row_sum[$_month] =
$entry[$_month]['info']['service_time'] +
$entry[$_month]['info']['controle_time'];
@@ -674,10 +717,13 @@
$row_sum[$_month] = 0;
}
}
- $total_time[] = $row_sum;
- $data_set[] = $row;
+ if(!$filter_status || $found_at_least_one)
+ {
+ $total_time[] = $row_sum;
+ $data_set[] = $row;
+ }
}
- $fields = $this->get_fields();
+ $fields = $this->get_fields($filter_component_str);
$class = '';
$tbody = '';
foreach($data_set as $row_data )
@@ -729,12 +775,45 @@
return $result;
}
- private function translate_calendar_info($param = array(),
$year, $month)
+ private function translate_calendar_info($param = array(),
$year, $month, $filter_status = '', &$found_at_least_one = false)
{
if(!isset($param['repeat_type']))
{
return '';
}
+
+ if($filter_status)
+ {
+ if($filter_status == 'not_performed')
+ {
+ switch($param['status'])
+ {
+ case "CONTROL_NOT_DONE":
+ case "CONTROL_REGISTERED":
+ case "CONTROL_PLANNED":
+ case
"CONTROL_NOT_DONE_WITH_PLANNED_DATE":
+ break;//continues
+ default:
+ return;
+ }
+ }
+ else if($filter_status ==
'done_with_open_deviation')
+ {
+ switch($param['status'])
+ {
+ // case
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS":
+ // case
"CONTROL_DONE_IN_TIME_WITHOUT_ERRORS":
+ case "CONTROL_DONE_WITH_ERRORS":
+ // case "CONTROL_CANCELED":
+ break;//continues
+ default:
+ return;
+ }
+ }
+ }
+
+ $found_at_least_one = true;
+
switch($param['status'])
{
case "CONTROL_NOT_DONE":
@@ -763,7 +842,7 @@
break;
case "CONTROL_DONE_WITH_ERRORS":
$status = "Utført med
{$param['info']['num_open_cases']} åpne avvik";
- $img = "<img height=\"15\"
src=\"controller/images/status_icon_yellow_ring.png\" title=\"{$status}\"/>
({$param['info']['num_open_cases']})";
+ $img = "<img height=\"15\"
src=\"controller/images/status_icon_red_empty.png\" title=\"{$status}\"/>
({$param['info']['num_open_cases']})";
break;
case "CONTROL_CANCELED":
$status = 'Kansellert';
@@ -784,6 +863,7 @@
else
{
$menuaction =
'controller.uicheck_list.add_check_list';
+ $a_date = "{$year}-{$month}-23";
$control_link_data = array
(
'menuaction' => $menuaction,
@@ -791,8 +871,9 @@
'location_id' =>
$param['info']['location_id'],
'component_id' =>
$param['info']['component_id'],
'serie_id' =>
$param['info']['serie_id'],
- 'deadline_ts' => mktime(23, 59, 00,
$month, date('t', $month), $year),
- 'type' =>
$param['info']['component_id'] ? 'component' : ''
+ 'deadline_ts' => mktime(23, 59, 00,
$month, date('t', strtotime($a_date)), $year),
+ 'type' =>
$param['info']['component_id'] ? 'component' : '',
+ 'assigned_to' =>
$param['info']['assigned_to']
);
}
$link = "<a
href=\"".$GLOBALS['phpgw']->link('/index.php',$control_link_data)."\"
target=\"_blank\">{$img}</a>";
Modified:
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -40,7 +40,7 @@
$this->check_list = $check_list;
if(!$type)
{
- $check_list->get_component_id() ? 'component' :
'';
+ $type = $check_list->get_component_id() ?
'component' : '';
}
$this->type = $type;
}
Modified:
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -94,6 +94,11 @@
{
foreach($check_lists_array as $check_list)
{
+ if(isset($this->control_relation['serie_id']) &&
$check_list->get_serie_id() != $this->control_relation['serie_id'])
+ {
+ continue;
+ }
+
$check_list_status_manager = new
check_list_status_manager( $check_list );
$check_list_status_info =
$check_list_status_manager->get_status_for_check_list();
Modified:
branches/Version-1_0-branch/controller/js/controller/check_list_update_status.js
===================================================================
---
branches/Version-1_0-branch/controller/js/controller/check_list_update_status.js
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/js/controller/check_list_update_status.js
2015-06-15 07:09:00 UTC (rev 13432)
@@ -22,6 +22,11 @@
if (jsonObj.status == 'not_saved')
{
$(submitBnt).val("feil ved
lagring");
+ if (jsonObj.message)
+ {
+ alert(jsonObj.message);
+ }
+
}
else if (jsonObj.status == '1')
{
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2015-06-14
17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2015-06-15
07:09:00 UTC (rev 13432)
@@ -245,6 +245,7 @@
status_unknown controller no Ukjent status
status controller no Status
status not done controller no Ikke utført
+done with open deviation controller no Utført med åpne avvik
Success controller no Suksess
sum controller no Sum
System setting for responsibility id for the current user must be 6
characters. controller no Systeminnstilling for ansvar må være
seks tegn.
Modified:
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2015-06-15 07:09:00 UTC (rev 13432)
@@ -23,43 +23,47 @@
</xsl:choose>
</div>
<div class="box-2 select-box">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- Kontrollplan for bygg/eiendom (år)
- </a>
-
- <a class="last">
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month_nr"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- Kontrolplan for bygg/eiendom (måned)
- </a>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&location_id=</xsl:text>
+ <xsl:value-of
select="component_array/location_id"/>
+
<xsl:text>&component_id=</xsl:text>
+ <xsl:value-of
select="component_array/id"/>
+ </xsl:attribute>
+ Kontrollplan for komponent (år)
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Kontrollplan for bygg/eiendom (år)
+ </a>
+
+ <a class="last">
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Kontrolplan for bygg/eiendom (måned)
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
Modified:
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2015-06-15 07:09:00 UTC (rev 13432)
@@ -24,43 +24,45 @@
</div>
<div class="box-2 select-box">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- Vis kontrollplan (år)
- </a>
-
- <a class="last">
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month_nr"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of
select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- Vis kontrollplan (måned)
- </a>
+ <xsl:when test="type = 'component'">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&location_id=</xsl:text>
+ <xsl:value-of
select="component_array/location_id"/>
+
<xsl:text>&component_id=</xsl:text>
+ <xsl:value-of
select="component_array/id"/>
+ </xsl:attribute>
+ Kontrollplan for komponent (år)
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Vis kontrollplan (år)
+ </a>
+
+ <a class="last">
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Vis kontrollplan (måned)
+ </a>
+ </xsl:otherwise>
</div>
<!-- ================== CHECKLIST TAB MENU
===================== -->
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/check_list_top_section.xsl
2015-06-15 07:09:00 UTC (rev 13432)
@@ -23,13 +23,13 @@
</xsl:choose>
</div>
- <div class="box-2 select-box">
- <xsl:call-template name="nav_control_plan" />
- </div>
+
<!-- ================== CHANGE STATUS FOR CHECKLIST
===================== -->
<xsl:choose>
<xsl:when test="check_list/id != 0">
+ <div class="box-2 select-box">
+ <xsl:call-template name="nav_control_plan" />
<xsl:variable name="action_url"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicheck_list.update_status,phpgw_return_as:json')"
/></xsl:variable>
<form id="update-check-list-status" class="done"
action="{$action_url}" method="post">
<input type="hidden"
name="check_list_id" value="{check_list/id}" />
@@ -64,9 +64,9 @@
</div>
-->
</form>
+ </div>
</xsl:when>
</xsl:choose>
-
<!-- ================== CHECKLIST TAB MENU
===================== -->
<xsl:choose>
<xsl:when test="count(check_list_type) = 0 or check_list_type !=
'add_check_list'">
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
2015-06-14 17:34:16 UTC (rev 13431)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/fragments/nav_control_plan.xsl
2015-06-15 07:09:00 UTC (rev 13432)
@@ -1,42 +1,49 @@
<xsl:template name="nav_control_plan" xmlns:php="http://php.net/xsl">
- <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+ <xsl:variable name="session_url">&
+ <xsl:value-of select="php:function('get_phpgw_session_url')" />
+ </xsl:variable>
- <a>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis kontrolplan for år
- </a>
- <a class="last">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of select="current_month_nr"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <xsl:value-of select="building_location_code"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="location_array/location_code"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis kontrolplan for måned
- </a>
- </xsl:template>
\ No newline at end of file
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_id=</xsl:text>
+ <xsl:value-of
select="component_array/location_id"/>
+ <xsl:text>&component_id=</xsl:text>
+ <xsl:value-of
select="component_array/id"/>
+ </xsl:attribute>
+ Kontrollplan for komponent (år)
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Kontrollplan for bygg/eiendom (år)
+ </a>
+
+ <a class="last">
+ <xsl:attribute name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Kontrolplan for bygg/eiendom (måned)
+ </a>
+
+ </xsl:otherwise>
+ </xsl:choose>
+
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/component.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/component.xsl
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/controller/templates/base/component.xsl
2015-06-15 07:09:00 UTC (rev 13432)
@@ -180,6 +180,15 @@
<xsl:template name="datasource-definition">
<script type="text/javascript">
<![CDATA[
+ $(document).ready(function(){
+ update_table();
+ });
+
+ deselect_component = function()
+ {
+ $("[name='filter_component']").val('');
+ update_table();
+ };
update_table = function()
{
var requestUrl = $("#queryForm").attr("action");
@@ -253,6 +262,8 @@
<table id="components">
<thead>
<tr>
+ <td id='selected'>
+ </td>
<td id='total_records'>
</td>
<td id='sum_text'>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.cache.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.cache.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.cache.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -596,4 +596,20 @@
return !!self::session_set('phpgwapi',
'phpgw_messages', $receipt);
}
+
+ /**
+ * GET system message from the session cache
+ *
+ * @param bool clear flag
+ * @return array containing messages
+ */
+ public static function message_get($clear = false)
+ {
+ $messages = self::session_get('phpgwapi',
'phpgw_messages');
+ if($clear)
+ {
+ self::session_clear('phpgwapi',
'phpgw_messages');
+ }
+ return $messages;
+ }
}
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -447,6 +447,7 @@
$location_id = isset($data['location_id'])
&& $data['location_id'] ? (int)$data['location_id'] : 0;
$entity_group_id =
isset($data['entity_group_id']) && $data['entity_group_id'] ?
(int)$data['entity_group_id'] : 0;
$filter_entity_group=
isset($data['filter_entity_group']) && $data['filter_entity_group'] ?
(int)$data['filter_entity_group'] : 0;
+ $filter_item = isset($data['filter_item'])
&& $data['filter_item'] ? (int)$data['filter_item'] : 0;
if($location_id)
@@ -614,6 +615,12 @@
$where= 'AND';
}
+ if ($filter_item)
+ {
+ $filtermethod .= " {$where} {$entity_table}.id
= {$filter_item}";
+ $where= 'AND';
+ }
+
$_querymethod = array();
$__querymethod = array();
$_joinmethod_datatype = array();
@@ -1338,6 +1345,7 @@
$org_units = isset($data['org_units']) &&
is_array($data['org_units']) ? $data['org_units'] : array();
$location_id = isset($data['location_id']) &&
$data['location_id'] ? (int)$data['location_id'] : 0;
$entity_group_id= isset($data['entity_group_id']) &&
$data['entity_group_id'] ? (int)$data['entity_group_id'] : 0;
+ $filter_entity_group=
isset($data['filter_entity_group']) && $data['filter_entity_group'] ?
(int)$data['filter_entity_group'] : 0;
if($location_id)
@@ -1524,6 +1532,17 @@
$where= 'AND';
}
+ if ($entity_group_id)
+ {
+ $filtermethod .= " {$where}
{$entity_table}.entity_group_id = {$entity_group_id}";
+ $where= 'AND';
+ }
+ if ($filter_entity_group)
+ {
+ $filtermethod .= " {$where}
{$entity_table}.entity_group_id IS NULL";
+ $where= 'AND';
+ }
+
$_querymethod = array();
$__querymethod = array();
$_joinmethod_datatype = array();
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2015-06-14 17:34:16 UTC (rev 13431)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2015-06-15 07:09:00 UTC (rev 13432)
@@ -3583,6 +3583,7 @@
$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)
{
@@ -3597,6 +3598,17 @@
'component_id' => $id,
'serie_id' =>
$entry['serie_id']
);
+*/
+
+ $menuaction =
'controller.uicomponent.index';
+
+ $control_link_data = array
+ (
+ 'menuaction' => $menuaction,
+ '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']);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13432] Merge 13417:13431 from trunk,
Sigurd Nes <=