diff --git a/Makefile b/Makefile index 495e6bfc..972ab3f6 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ push_test: (chown -Rf :mam . || true ) && \ (chmod -Rf g+w . || true ) && \ echo 'Reloading apache ... (You may have to start it manually on error!)' && \ - ~/etc/apache2/apache2ctl -k reload && \ + ~/etc/apache2/apache2ctl -k restart && \ echo Done." @echo "Test pushed to ${TEST_SERVER}:${TEST_DIR} successfully." diff --git a/dakosdump/README.md b/dakosdump/README.md index 13d103d6..fbeef4c5 100644 --- a/dakosdump/README.md +++ b/dakosdump/README.md @@ -180,6 +180,18 @@ Témata: c = ThreadedComment.objects.create(**d) tab_ID_REAK_to_ThrComment_id[i.ID_REAK] = c.id + tab_ID_REAK_to_ThrComment_id = {u'344': 6884, u'345': 6885, u'346': 6886, u'347': 6887, u'340': 6880, u'341': 6881, u'342': 6882, u'343': 6883, u'810': 7402, u'811': 7403, u'812': 7404, u'813': 7405, u'348': 6888, u'349': 6889, u'816': 7408, u'817': 7409, u'595': 7162, u'719': 7300, u'718': 7299, u'717': 7298, u'716': 7297, u'715': 7296, u'714': 7295, u'713': 7294, u'712': 7293, u'711': 7292, u'710': 7291, u'915': 7517, u'914': 7516, u'606': 7175, u'917': 7519, u'594': 7161, u'736': 7319, u'916': 7518, u'911': 7513, u'619': 7189, u'910': 7512, u'913': 7515, u'298': 6832, u'299': 6833, u'296': 6830, u'297': 6831, u'294': 6828, u'295': 6829, u'292': 6826, u'293': 6827, u'290': 6824, u'291': 6825, u'591': 7158, u'590': 7157, u'593': 7160, u'592': 7159, u'199': 6722, u'198': 6721, u'597': 7164, u'596': 7163, u'195': 6718, u'194': 6717, u'197': 6720, u'196': 6719, u'191': 6714, u'190': 6713, u'193': 6716, u'192': 6715, u'270': 6802, u'271': 6803, u'272': 6804, u'273': 6805, u'274': 6806, u'275': 6807, u'276': 6808, u'277': 6809, u'278': 6810, u'279': 6811, u'738': 7321, u'524': 7084, u'525': 7085, u'526': 7086, u'527': 7087, u'520': 7080, u'521': 7081, u'522': 7082, u'523': 7083, u'599': 7166, u'528': 7088, u'529': 7089, u'449': 7000, u'448': 6999, u'443': 6994, u'442': 6993, u'441': 6992, u'440': 6991, u'447': 6998, u'446': 6997, u'445': 6996, u'444': 6995, u'108': 6622, u'109': 6623, u'102': 6616, u'103': 6617, u'100': 6614, u'101': 6615, u'106': 6620, u'107': 6621, u'104': 6618, u'105': 6619, u'902': 7503, u'903': 7504, u'39': 6934, u'38': 6923, u'906': 7507, u'907': 7508, u'904': 7505, u'905': 7506, u'33': 6868, u'32': 6857, u'31': 6846, u'30': 6835, u'37': 6912, u'36': 6901, u'35': 6890, u'34': 6879, u'641': 7214, u'640': 7213, u'643': 7216, u'642': 7215, u'645': 7218, u'644': 7217, u'438': 6988, u'439': 6989, u'436': 6986, u'437': 6987, u'434': 6984, u'435': 6985, u'432': 6982, u'433': 6983, u'430': 6980, u'431': 6981, u'339': 6878, u'338': 6877, u'335': 6874, u'334': 6873, u'337': 6876, u'336': 6875, u'331': 6870, u'330': 6869, u'333': 6872, u'332': 6871, u'89': 7488, u'744': 7328, u'745': 7329, u'854': 7450, u'818': 7410, u'856': 7451, u'857': 7452, u'850': 7446, u'851': 7447, u'852': 7448, u'819': 7411, u'858': 7453, u'859': 7454, u'748': 7332, u'6': 7167, u'900': 7501, u'848': 7443, u'99': 7589, u'98': 7588, u'844': 7439, u'91': 7511, u'90': 7500, u'93': 7533, u'92': 7522, u'95': 7555, u'94': 7544, u'97': 7577, u'96': 7566, u'814': 7406, u'815': 7407, u'740': 7324, u'741': 7325, u'742': 7326, u'743': 7327, u'559': 7122, u'558': 7121, u'746': 7330, u'747': 7331, u'555': 7118, u'554': 7117, u'557': 7120, u'556': 7119, u'551': 7114, u'550': 7113, u'553': 7116, u'552': 7115, u'238': 6766, u'239': 6767, u'234': 6762, u'235': 6763, u'236': 6764, u'237': 6765, u'230': 6758, u'231': 6759, u'232': 6760, u'233': 6761, u'1': 6612, u'614': 7184, u'146': 6664, u'147': 6665, u'144': 6662, u'145': 6663, u'142': 6660, u'143': 6661, u'140': 6658, u'141': 6659, u'612': 7182, u'613': 7183, u'610': 7180, u'611': 7181, u'616': 7186, u'617': 7187, u'148': 6666, u'149': 6667, u'912': 7514, u'951': 7557, u'948': 7553, u'949': 7554, u'946': 7551, u'947': 7552, u'944': 7549, u'945': 7550, u'942': 7547, u'943': 7548, u'940': 7545, u'941': 7546, u'768': 7354, u'689': 7266, u'688': 7265, u'685': 7262, u'684': 7261, u'687': 7264, u'686': 7263, u'681': 7258, u'680': 7257, u'683': 7260, u'682': 7259, u'623': 7194, u'622': 7193, u'133': 6650, u'132': 6649, u'131': 6648, u'130': 6647, u'137': 6654, u'136': 6653, u'135': 6652, u'134': 6651, u'494': 7050, u'495': 7051, u'139': 6656, u'138': 6655, u'490': 7046, u'491': 7047, u'492': 7048, u'493': 7049, u'24': 6768, u'25': 6779, u'26': 6790, u'27': 6801, u'20': 6724, u'21': 6735, u'22': 6746, u'23': 6757, u'927': 7530, u'28': 6812, u'29': 6823, u'407': 6954, u'406': 6953, u'405': 6952, u'404': 6951, u'403': 6950, u'402': 6949, u'401': 6948, u'400': 6947, u'933': 7537, u'932': 7536, u'931': 7535, u'930': 7534, u'937': 7541, u'629': 7200, u'409': 6956, u'408': 6955, u'628': 7199, u'758': 7343, u'379': 6922, u'378': 6921, u'829': 7422, u'828': 7421, u'371': 6914, u'370': 6913, u'373': 6916, u'372': 6915, u'375': 6918, u'374': 6917, u'377': 6920, u'376': 6919, u'708': 7288, u'709': 7289, u'704': 7284, u'705': 7285, u'706': 7286, u'707': 7287, u'700': 7280, u'618': 7188, u'702': 7282, u'703': 7283, u'393': 6938, u'392': 6937, u'391': 6936, u'390': 6935, u'397': 6942, u'396': 6941, u'395': 6940, u'394': 6939, u'82': 7412, u'83': 7423, u'399': 6944, u'398': 6943, u'86': 7455, u'87': 7466, u'84': 7434, u'85': 7445, u'797': 7386, u'796': 7385, u'795': 7384, u'794': 7383, u'793': 7382, u'792': 7381, u'791': 7380, u'790': 7379, u'799': 7388, u'798': 7387, u'7': 7278, u'601': 7170, u'607': 7176, u'586': 7152, u'587': 7153, u'584': 7150, u'585': 7151, u'582': 7148, u'583': 7149, u'580': 7146, u'581': 7147, u'588': 7154, u'589': 7155, u'245': 6774, u'244': 6773, u'247': 6776, u'246': 6775, u'241': 6770, u'240': 6769, u'243': 6772, u'242': 6771, u'615': 7185, u'249': 6778, u'248': 6777, u'924': 7527, u'970': 7578, u'925': 7528, u'519': 7078, u'518': 7077, u'926': 7529, u'511': 7070, u'510': 7069, u'513': 7072, u'512': 7071, u'515': 7074, u'514': 7073, u'517': 7076, u'516': 7075, u'458': 7010, u'459': 7011, u'621': 7192, u'620': 7191, u'627': 7198, u'626': 7197, u'625': 7196, u'624': 7195, u'450': 7002, u'451': 7003, u'452': 7004, u'453': 7005, u'454': 7006, u'455': 7007, u'456': 7008, u'457': 7009, u'179': 6700, u'178': 6699, u'177': 6698, u'176': 6697, u'175': 6696, u'174': 6695, u'173': 6694, u'172': 6693, u'171': 6692, u'170': 6691, u'977': 7585, u'656': 7230, u'975': 7583, u'974': 7582, u'973': 7581, u'972': 7580, u'971': 7579, u'657': 7231, u'654': 7228, u'979': 7587, u'978': 7586, u'182': 6704, u'183': 6705, u'180': 6702, u'181': 6703, u'186': 6708, u'187': 6709, u'184': 6706, u'185': 6707, u'886': 7484, u'652': 7226, u'188': 6710, u'189': 6711, u'658': 7232, u'653': 7227, u'650': 7224, u'651': 7225, u'764': 7350, u'11': 6624, u'10': 6613, u'13': 6646, u'12': 6635, u'15': 6668, u'14': 6657, u'17': 6690, u'16': 6679, u'19': 6712, u'18': 6701, u'863': 7459, u'862': 7458, u'865': 7461, u'864': 7460, u'867': 7463, u'866': 7462, u'884': 7482, u'938': 7542, u'659': 7233, u'883': 7481, u'753': 7338, u'881': 7479, u'880': 7478, u'887': 7485, u'831': 7425, u'885': 7483, u'752': 7337, u'928': 7531, u'62': 7190, u'888': 7486, u'950': 7556, u'756': 7341, u'929': 7532, u'63': 7201, u'809': 7400, u'322': 6860, u'323': 6861, u'320': 6858, u'321': 6859, u'326': 6864, u'327': 6865, u'324': 6862, u'325': 6863, u'328': 6866, u'329': 6867, u'759': 7344, u'201': 6726, u'200': 6725, u'203': 6728, u'202': 6727, u'205': 6730, u'204': 6729, u'207': 6732, u'206': 6731, u'209': 6734, u'208': 6733, u'779': 7366, u'778': 7365, u'889': 7487, u'77': 7356, u'76': 7345, u'75': 7334, u'74': 7323, u'73': 7312, u'72': 7301, u'71': 7290, u'70': 7279, u'655': 7229, u'79': 7378, u'78': 7367, u'2': 6723, u'805': 7396, u'804': 7395, u'669': 7244, u'668': 7243, u'667': 7242, u'666': 7241, u'665': 7240, u'664': 7239, u'663': 7238, u'662': 7237, u'661': 7236, u'660': 7235, u'769': 7355, u'692': 7270, u'693': 7271, u'690': 7268, u'691': 7269, u'696': 7274, u'697': 7275, u'694': 7272, u'695': 7273, u'698': 7276, u'699': 7277, u'542': 7104, u'543': 7105, u'540': 7102, u'541': 7103, u'546': 7108, u'547': 7109, u'544': 7106, u'545': 7107, u'8': 7389, u'548': 7110, u'549': 7111, u'68': 7256, u'598': 7165, u'869': 7465, u'868': 7464, u'120': 6636, u'121': 6637, u'122': 6638, u'123': 6639, u'124': 6640, u'125': 6641, u'126': 6642, u'127': 6643, u'128': 6644, u'129': 6645, u'765': 7351, u'69': 7267, u'414': 6962, u'415': 6963, u'416': 6964, u'417': 6965, u'410': 6958, u'411': 6959, u'412': 6960, u'413': 6961, u'920': 7523, u'498': 7054, u'922': 7525, u'923': 7526, u'418': 6966, u'419': 6967, u'776': 7363, u'499': 7055, u'319': 6856, u'318': 6855, u'313': 6850, u'312': 6849, u'311': 6848, u'310': 6847, u'317': 6854, u'316': 6853, u'315': 6852, u'314': 6851, u'861': 7457, u'921': 7524, u'496': 7052, u'832': 7426, u'833': 7427, u'830': 7424, u'497': 7053, u'836': 7430, u'837': 7431, u'834': 7428, u'835': 7429, u'838': 7432, u'839': 7433, u'808': 7399, u'3': 6834, u'368': 6910, u'369': 6911, u'366': 6908, u'367': 6909, u'364': 6906, u'365': 6907, u'362': 6904, u'363': 6905, u'360': 6902, u'361': 6903, u'959': 7565, u'952': 7558, u'882': 7480, u'380': 6924, u'381': 6925, u'382': 6926, u'383': 6927, u'384': 6928, u'385': 6929, u'386': 6930, u'387': 6931, u'388': 6932, u'389': 6933, u'784': 7372, u'785': 7373, u'786': 7374, u'787': 7375, u'780': 7368, u'781': 7369, u'782': 7370, u'783': 7371, u'788': 7376, u'789': 7377, u'860': 7456, u'605': 7174, u'579': 7144, u'578': 7143, u'604': 7173, u'573': 7138, u'572': 7137, u'571': 7136, u'570': 7135, u'577': 7142, u'576': 7141, u'575': 7140, u'574': 7139, u'60': 7168, u'61': 7179, u'258': 6788, u'259': 6789, u'64': 7212, u'65': 7223, u'66': 7234, u'67': 7245, u'252': 6782, u'253': 6783, u'250': 6780, u'251': 6781, u'256': 6786, u'257': 6787, u'254': 6784, u'255': 6785, u'603': 7172, u'602': 7171, u'939': 7543, u'731': 7314, u'730': 7313, u'733': 7316, u'732': 7315, u'735': 7318, u'734': 7317, u'508': 7066, u'509': 7067, u'506': 7064, u'507': 7065, u'504': 7062, u'505': 7063, u'502': 7060, u'503': 7061, u'500': 7058, u'501': 7059, u'630': 7202, u'631': 7203, u'632': 7204, u'633': 7205, u'469': 7022, u'468': 7021, u'636': 7208, u'637': 7209, u'465': 7018, u'464': 7017, u'467': 7020, u'466': 7019, u'461': 7014, u'460': 7013, u'463': 7016, u'462': 7015, u'901': 7502, u'168': 6688, u'169': 6689, u'164': 6684, u'165': 6685, u'166': 6686, u'167': 6687, u'160': 6680, u'161': 6681, u'162': 6682, u'163': 6683, u'964': 7571, u'965': 7572, u'966': 7573, u'967': 7574, u'960': 7567, u'961': 7568, u'962': 7569, u'963': 7570, u'968': 7575, u'969': 7576, u'936': 7540, u'935': 7539, u'934': 7538, u'908': 7509, u'909': 7510, u'600': 7169, u'878': 7475, u'879': 7476, u'876': 7473, u'877': 7474, u'874': 7471, u'875': 7472, u'872': 7469, u'873': 7470, u'870': 7467, u'871': 7468, u'9': 7499, u'890': 7489, u'891': 7490, u'892': 7491, u'893': 7492, u'894': 7493, u'647': 7220, u'896': 7495, u'897': 7496, u'898': 7497, u'899': 7498, u'646': 7219, u'649': 7222, u'648': 7221, u'357': 6898, u'356': 6897, u'355': 6896, u'354': 6895, u'353': 6894, u'352': 6893, u'351': 6892, u'350': 6891, u'803': 7394, u'802': 7393, u'801': 7392, u'800': 7391, u'807': 7398, u'806': 7397, u'359': 6900, u'358': 6899, u'216': 6742, u'217': 6743, u'214': 6740, u'215': 6741, u'212': 6738, u'213': 6739, u'210': 6736, u'211': 6737, u'762': 7348, u'763': 7349, u'760': 7346, u'761': 7347, u'766': 7352, u'767': 7353, u'218': 6744, u'219': 6745, u'957': 7563, u'956': 7562, u'289': 6822, u'288': 6821, u'4': 6945, u'281': 6814, u'280': 6813, u'283': 6816, u'282': 6815, u'285': 6818, u'284': 6817, u'287': 6820, u'286': 6819, u'678': 7254, u'679': 7255, u'674': 7250, u'675': 7251, u'676': 7252, u'677': 7253, u'670': 7246, u'671': 7247, u'672': 7248, u'673': 7249, u'263': 6794, u'262': 6793, u'261': 6792, u'260': 6791, u'267': 6798, u'266': 6797, u'265': 6796, u'264': 6795, u'269': 6800, u'268': 6799, u'701': 7281, u'59': 7156, u'58': 7145, u'55': 7112, u'54': 7101, u'57': 7134, u'56': 7123, u'51': 7068, u'50': 7057, u'53': 7090, u'52': 7079, u'537': 7098, u'536': 7097, u'535': 7096, u'534': 7095, u'533': 7094, u'532': 7093, u'531': 7092, u'530': 7091, u'539': 7100, u'538': 7099, u'775': 7362, u'774': 7361, u'777': 7364, u'115': 6630, u'114': 6629, u'117': 6632, u'116': 6631, u'111': 6626, u'110': 6625, u'113': 6628, u'112': 6627, u'771': 7358, u'119': 6634, u'118': 6633, u'770': 7357, u'773': 7360, u'772': 7359, u'953': 7559, u'429': 6978, u'428': 6977, u'919': 7521, u'918': 7520, u'421': 6970, u'420': 6969, u'423': 6972, u'422': 6971, u'425': 6974, u'424': 6973, u'427': 6976, u'426': 6975, u'308': 6844, u'309': 6845, u'300': 6836, u'301': 6837, u'302': 6838, u'303': 6839, u'304': 6840, u'305': 6841, u'306': 6842, u'307': 6843, u'895': 7494, u'825': 7418, u'824': 7417, u'827': 7420, u'847': 7442, u'846': 7441, u'845': 7440, u'826': 7419, u'843': 7438, u'842': 7437, u'841': 7436, u'840': 7435, u'821': 7414, u'853': 7449, u'849': 7444, u'820': 7413, u'823': 7416, u'822': 7415, u'954': 7560, u'568': 7132, u'569': 7133, u'751': 7336, u'750': 7335, u'757': 7342, u'737': 7320, u'755': 7340, u'754': 7339, u'560': 7124, u'561': 7125, u'562': 7126, u'563': 7127, u'564': 7128, u'565': 7129, u'566': 7130, u'567': 7131, u'739': 7322, u'229': 6756, u'228': 6755, u'227': 6754, u'226': 6753, u'225': 6752, u'224': 6751, u'223': 6750, u'222': 6749, u'221': 6748, u'220': 6747, u'88': 7477, u'726': 7308, u'727': 7309, u'724': 7306, u'725': 7307, u'722': 7304, u'723': 7305, u'720': 7302, u'721': 7303, u'728': 7310, u'729': 7311, u'151': 6670, u'150': 6669, u'153': 6672, u'152': 6671, u'155': 6674, u'154': 6673, u'157': 6676, u'156': 6675, u'159': 6678, u'158': 6677, u'609': 7178, u'608': 7177, u'976': 7584, u'634': 7206, u'80': 7390, u'635': 7207, u'749': 7333, u'958': 7564, u'81': 7401, u'48': 7034, u'49': 7045, u'46': 7012, u'47': 7023, u'44': 6990, u'45': 7001, u'42': 6968, u'43': 6979, u'40': 6946, u'41': 6957, u'638': 7210, u'5': 7056, u'639': 7211, u'489': 7044, u'488': 7043, u'487': 7042, u'486': 7041, u'485': 7040, u'484': 7039, u'483': 7038, u'482': 7037, u'481': 7036, u'480': 7035, u'955': 7561, u'472': 7026, u'473': 7027, u'470': 7024, u'471': 7025, u'476': 7030, u'477': 7031, u'474': 7028, u'475': 7029, u'478': 7032, u'479': 7033} + +#### Odstranění duplicit z Problem #### + +`AZAD:*` + + for i in Problem.objects.filter(import_dakos_id__contains='AZAD'): + p = Problem.objects.filter(kod=i.kod, cislo_zadani=i.cislo_zadani, typ=i.typ); + q = [j for j in p if j.import_dakos_id[:2] != 'AZ'] + if q: + print i.nazev==j.nazev, i.nazev, j.nazev + ### Konkrétní programy pro data (starší metoda) ### diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index b63e27a1..84abd9cd 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -25,7 +25,7 @@ APPEND_SLASH = False LANGUAGE_CODE = 'cs' TIME_ZONE = 'Europe/Prague' -USE_I18N = False +USE_I18N = True USE_L10N = True USE_TZ = True diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html index aa2a570d..d0af5551 100644 --- a/mamweb/templates/menu.html +++ b/mamweb/templates/menu.html @@ -3,7 +3,7 @@ + {% if cislo.verejna_vysledkovka %}

Výsledkovka

+ {% else %} +
+

Výsledkovka (neveřejná)

+ {% endif %} @@ -44,6 +49,11 @@ {% endfor %}
+ {% if cislo.verejna_vysledkovka %} + {% else %} +
+ {% endif %} + {% endblock content %} diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 5c644f47..4de380aa 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -4,6 +4,42 @@

Organizátoři

+ {% for org in object_list %} + {% if org.user.is_active %} + Aktivní + {% else %} + Není aktivní + {% endif %} + {{org.user.first_name}} + {% if org.prezdivka %} + "{{org.prezdivka}}" + {% endif %} + {{org.user.last_name}}
+ + {% if org.foto %} +
+ + +
+ {% endif %} +
+ {% endfor %} +
{% endblock content %} diff --git a/seminar/templates/seminar/export_index.csv b/seminar/templates/seminar/export_index.csv deleted file mode 100644 index edb833cf..00000000 --- a/seminar/templates/seminar/export_index.csv +++ /dev/null @@ -1,2 +0,0 @@ -{% for e in exports %}{{ e }} -{% endfor %} diff --git a/seminar/templates/seminar/export_rocnik.csv b/seminar/templates/seminar/export_rocnik.csv deleted file mode 100644 index a8668e39..00000000 --- a/seminar/templates/seminar/export_rocnik.csv +++ /dev/null @@ -1,11 +0,0 @@ -version 1 -event MaM.rocnik -year {{ rocnik.prvni_rok }} -date {{ date }} -id-scope mam -id-generation 1 -comment MaM-Web export aktivnich resitelu rocniku {{ rocnik }} do cisla {{ cislo.kod }} - -{% for c in sloupce %}{{ c }} {% endfor %} -{% for r in radky %}{% for c in r %}{{ c }} {% endfor %} -{% endfor %} diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html new file mode 100644 index 00000000..1159f9e6 --- /dev/null +++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html @@ -0,0 +1,45 @@ +{% extends "seminar/soustredeni/base.html" %} + +{% block content %} + +

Soustředění

+ + {# Projdi vsechna soustredeni #} + {% for soustredeni in object_list %} + {# Kdyz je verejne -> zobraz #} + {% if soustredeni.verejne_db or user.is_authenticated %} + {% if not soustredeni.verejne_db and user.is_authenticated %} + Groups of user: {{user.groups.all}}
+ + Toto soustředění není veřejné, vidíte ho jen proto, + že jste přihlášení.
+ {% endif %} + {# misto soustredeni TODO upravit#} + {% if soustredeni.misto %} +

+ Soustředění v {{soustredeni.misto}} + od {{soustredeni.datum_zacatku}} do {{soustredeni.datum_konce}} + při {{soustredeni.rocnik.rocnik}}. ročníku M&M +

+ {% endif %} + {# popis soustredeni #} + {% if soustredeni.text %} + {% autoescape off %}{{soustredeni.text}}{% endautoescape %} + {% endif %} + {# Účastníci #} +

Soustředění se zůčastnili tito účastníci:

+ + {% endif %} + {% empty %} + Žádná soustředění zatím neproběhla! + {% endfor %} + +{% endblock %} + diff --git a/seminar/tests.py b/seminar/tests.py index 2a22d721..80bbfaa3 100644 --- a/seminar/tests.py +++ b/seminar/tests.py @@ -29,7 +29,7 @@ class SeminarBasicTests(TestCase): def test_render_cislo_e2e(self): cs = Cislo.objects.all() for c in cs[:4]: - url = reverse('seminar_cislo', args=(c.id,)) + url = c.verejne_url() r = self.client.get(url) assert r.status_code == 200 assert len(r.content) >= 100 @@ -38,12 +38,25 @@ class SeminarBasicTests(TestCase): def test_render_problem_e2e(self): ps = Problem.objects.all() for p in ps[:4]: - url = reverse('seminar_problem', args=(p.id,)) + url = p.verejne_url() r = self.client.get(url) assert r.status_code == 200 assert len(r.content) >= 100 # TODO: Validate cntent as HTML + def test_export_e2e(self): + i_url = '/aesop-export/index.csv' + i_r = self.client.get(i_url) + assert i_r.status_code == 200 + ls = i_r.content.strip().split('\n') + + for u in [ls[0], ls[-1]]: + ex_r = self.client.get('/aesop-export/' + u) + assert ex_r.status_code == 200 + assert len(ex_r.content) >= 100 + o = ovvpfile.parse(ex_r.content) + assert o.headers['version'] == '1' + def test_admin_url(self): for m in [Skola, Resitel, Rocnik, Cislo, Problem, Reseni, Nastaveni]: o = m.objects.first() diff --git a/seminar/testutils.py b/seminar/testutils.py index 946efb28..d98b21b9 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -5,7 +5,7 @@ import random import django.contrib.auth from django.db import transaction -from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni +from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici from django.contrib.flatpages.models import FlatPage from django.contrib.sites.models import Site @@ -70,7 +70,7 @@ def create_test_data(size = 6, rnd = None): for ci in range(1, cisel + 1): vydano = datetime.date(r.prvni_rok, ci + 6, 1) deadline = datetime.date(r.prvni_rok, ci + 8, 1) if ci + 2 < cisel else None - c = Cislo.objects.create(rocnik = r, cislo = str(ci), datum_vydani=vydano, datum_deadline=deadline) + c = Cislo.objects.create(rocnik = r, cislo = str(ci), datum_vydani=vydano, datum_deadline=deadline, verejne_db=True) cs[ci] = c # problemy resene v ci @@ -91,6 +91,12 @@ def create_test_data(size = 6, rnd = None): res = Reseni.objects.create(problem = p, resitel = resitel, body = rnd.randint(0, p.body), cislo_body = cs[ci]) + sous = Soustredeni.objects.create(rocnik=Rocnik.objects.first(), verejne_db=True, misto=u'Někde', + datum_zacatku=datetime.date(2000, 11, 23), datum_konce=datetime.date(2000, 11, 27)) + for res in rnd.sample(resitele, 6): + Soustredeni_Ucastnici.objects.create(resitel=res, soustredeni=sous) + sous.save() + nastaveni = Nastaveni.objects.create(aktualni_rocnik = Rocnik.objects.last(), aktualni_cislo = Cislo.objects.all()[1]) diff --git a/seminar/urls.py b/seminar/urls.py index 31ae2886..fc401f2a 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -6,14 +6,18 @@ urlpatterns = patterns('', url(r'^co-je-MaM/organizatori/$', views.CojemamOrganizatoriView.as_view()), url(r'^archiv/cisla/$', views.CislaView.as_view()), - url(r'^archiv/cisla/rocnik/(?P\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'), - url(r'^archiv/cisla/cislo/(?P\d+)/$', views.CisloView.as_view(), name='seminar_cislo'), - url(r'^archiv/cisla/problem/(?P\d+)/$', views.ProblemView.as_view(), name='seminar_problem'), + url(r'^rocnik/(?P\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'), + url(r'^cislo/(?P\d+)\.(?P\d+)/$', views.CisloView.as_view(), name='seminar_cislo'), + url(r'^problem/(?P\d+)/$', views.ProblemView.as_view(), name='seminar_problem'), + + url(r'^soustredeni/$', views.SoustredeniListView.as_view(), + name = 'seminar_seznam_soustredeni'), url(r'^soustredeni/(?P\d+)/$', views.SoustredeniView.as_view(), name='seminar_soustredeni'), url(r'^zadani/aktualni/$', views.AktualniZadaniView, name='seminar_aktualni_zadani'), url(r'^aesop-export/mam-rocnik-(?P\d+)\.csv$', export.ExportRocnikView.as_view(), name='seminar_export_rocnik'), + url(r'^aesop-export/mam-sous-(?P[\d-]+)\.csv$', export.ExportSousView.as_view(), name='seminar_export_sous'), url(r'^aesop-export/index.csv$', export.ExportIndexView.as_view(), name='seminar_export_index'), ) diff --git a/seminar/views.py b/seminar/views.py index 96a89d5e..12fc1650 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -2,7 +2,10 @@ from django.shortcuts import get_object_or_404, render from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse from django.views import generic -from .models import Problem, Cislo, Reseni, VysledkyKCislu, Nastaveni, Rocnik, Soustredeni +from django.utils.translation import ugettext as _ +from django.http import Http404 + +from .models import Problem, Cislo, Reseni, VysledkyKCislu, Nastaveni, Rocnik, Soustredeni, Organizator def AktualniZadaniView(request): @@ -12,11 +15,14 @@ def AktualniZadaniView(request): }, ) -# Co je M&M +### Co je M&M -class CojemamOrganizatoriView(generic.TemplateView): +class CojemamOrganizatoriView(generic.ListView): + model = Organizator template_name='seminar/cojemam/organizatori.html' +### Archiv + class CislaView(generic.ListView): model = Rocnik template_name='seminar/archiv/cisla.html' @@ -25,9 +31,19 @@ class RocnikView(generic.DetailView): model = Rocnik template_name = 'seminar/archiv/rocnik.html' -class SoustredeniView(generic.DetailView): - model = Soustredeni - template_name = 'seminar/archiv/soustredeni.html' + # Vlastni ziskavani objektu z databaze podle (Rocnik.rocnik) + def get_object(self, queryset=None): + if queryset is None: + queryset = self.get_queryset() + rocnik_arg = self.kwargs.get('rocnik') + queryset = queryset.filter(rocnik=rocnik_arg) + + try: + obj = queryset.get() + except queryset.model.DoesNotExist: + raise Http404(_("No %(verbose_name)s found matching the query") % + {'verbose_name': queryset.model._meta.verbose_name}) + return obj class ProblemView(generic.DetailView): model = Problem @@ -39,26 +55,50 @@ class RadekVysledkovky(object): class CisloView(generic.DetailView): model = Cislo template_name = 'seminar/archiv/cislo.html' + + # Vlastni ziskavani objektu z databaze podle (Rocnik.rocnik) + def get_object(self, queryset=None): + if queryset is None: + queryset = self.get_queryset() + rocnik_arg = self.kwargs.get('rocnik') + cislo_arg = self.kwargs.get('cislo') + queryset = queryset.filter(rocnik__rocnik=rocnik_arg, cislo=cislo_arg) + + try: + obj = queryset.get() + except queryset.model.DoesNotExist: + raise Http404(_("No %(verbose_name)s found matching the query") % + {'verbose_name': queryset.model._meta.verbose_name}) + return obj + def get_context_data(self, **kwargs): context = super(CisloView, self).get_context_data(**kwargs) + # Vysledky k cislu: seznam objektu typu (cislo, resitel, body [v tom cisle], body_celkem [od zac. rocniku]) vysledky = VysledkyKCislu.objects.filter(cislo = context['cislo']).order_by('-body_celkem').select_related("resitel") + reseni = Reseni.objects.filter(cislo_body = context['cislo']).select_related("resitel") + # seznam problemu s nejakymi body v tomto cisle problemy = sorted(list(set([r.problem for r in reseni])), key=lambda x:(0 if x.typ==Problem.TYP_ULOHA else 1,x.kod)) + # cislo sloupecku pro problem (inverzni funkce) problem_index = {} for i in range(len(problemy)): problem_index[problemy[i].id] = i + # pomocna mapa Resitel: RadekVysledkovky vysledky_resitele = {} + # radky vysledkovky, seznam objektu RadekVysledkovky vysledkovka = [] + # posledni pocet bodu, pro detekci stejnych mist posledni_body = 100000 + for vi in range(len(vysledky)): v = vysledky[vi] tv = RadekVysledkovky() tv.resitel = v.resitel tv.vysledek = v - tv.body = ['']*len(problemy) + tv.body = ['']*len(problemy) # misto pro body za jednotlive uloy tv.poradi = '' if posledni_body > v.body_celkem: posledni_body = v.body_celkem @@ -66,6 +106,7 @@ class CisloView(generic.DetailView): vysledky_resitele[v.resitel.id] = tv vysledkovka.append(tv) + # doplneni bodu za jednotliva reseni lidi do RadekVysledkovky.body for r in reseni: vysledky_resitele[r.resitel.id].body[problem_index[r.problem.id]] = r.body @@ -73,4 +114,12 @@ class CisloView(generic.DetailView): context['problemy'] = problemy return context +### Soustredeni + +class SoustredeniListView(generic.ListView): + model = Soustredeni + template_name = 'seminar/soustredeni/seznam_soustredeni.html' +class SoustredeniView(generic.DetailView): + model = Soustredeni + template_name = 'seminar/archiv/soustredeni.html'