"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/engine/timetableexport.cpp" between
fet-5.47.0.tar.bz2 and fet-5.47.1.tar.bz2

About: FET allows to automatically schedule a timetable for e.g. of a school, high-school or university.

timetableexport.cpp  (fet-5.47.0.tar.bz2)	:	timetableexport.cpp  (fet-5.47.1.tar.bz2)
skipping to change at line 2413		skipping to change at line 2413
tos<<"\n";		tos<<"\n";
if(placedActivities!=gt.rules.nInternalActivities)		if(placedActivities!=gt.rules.nInternalActivities)
tos<<" "<<TimetableExport::tr("Warning! Only %1 out of %2 activ ities placed!").arg(placedActivities).arg(gt.rules.nInternalActivities)<<"\n";		tos<<" "<<TimetableExport::tr("Warning! Only %1 out of %2 activ ities placed!").arg(placedActivities).arg(gt.rules.nInternalActivities)<<"\n";
tos<<" "<<TimetableExport::tr("Stylesheet generated with FET %1 on %2", "%1 is FET version, %2 is date and time").arg(FET_VERSION).arg(saveTime)<<" */\ n\n";		tos<<" "<<TimetableExport::tr("Stylesheet generated with FET %1 on %2", "%1 is FET version, %2 is date and time").arg(FET_VERSION).arg(saveTime)<<" */\ n\n";
tos<<"/* "<<TimetableExport::tr("To do a page-break only after every seco nd timetable, delete \"page-break-before: always;\" in \"table.even_table\".",		tos<<"/* "<<TimetableExport::tr("To do a page-break only after every seco nd timetable, delete \"page-break-before: always;\" in \"table.even_table\".",
"Please keep fields in quotes as they are, untranslated.")<<" */\ n";		"Please keep fields in quotes as they are, untranslated.")<<" */\ n";
tos<<"/* "<<TimetableExport::tr("Delete \"page-break-before: always;\" in \"table.even_table\" and in \"table.odd_table\" to skip page-breaks.",		tos<<"/* "<<TimetableExport::tr("Delete \"page-break-before: always;\" in \"table.even_table\" and in \"table.odd_table\" to skip page-breaks.",
"Please keep fields in quotes as they are, untranslated.")<<" */\ n";		"Please keep fields in quotes as they are, untranslated.")<<" */\ n";
tos<<"/* "<<TimetableExport::tr("To hide an element just write the follow ing phrase into the element: %1 (without quotes).",		tos<<"/* "<<TimetableExport::tr("To hide an element just write the follow ing phrase into the element: %1 (without quotes).",
"%1 is a short phrase beginning and ending with quotes, and we wa nt the user to be able to add it, but without quotes").arg("\"display:none;\"")< <" */\n\n";		"%1 is a short phrase beginning and ending with quotes, and we wa nt the user to be able to add it, but without quotes").arg("\"display: none;\"") <<" */\n\n";
tos<<"p.back {\n margin-top: 4ex;\n margin-bottom: 5ex;\n}\n\n";		tos<<"p.back {\n margin-top: 4ex;\n margin-bottom: 5ex;\n}\n\n";
tos<<"table {\n text-align: center;\n page-break-inside: avoid;\n}\n\n" ;		tos<<"table {\n text-align: center;\n page-break-inside: avoid;\n}\n\n" ;
tos<<"table.odd_table {\n page-break-before: always;\n}\n\n";		tos<<"table.odd_table {\n page-break-before: always;\n}\n\n";
tos<<"table.even_table {\n page-break-before: always;\n}\n\n";		tos<<"table.even_table {\n page-break-before: always;\n}\n\n";
tos<<"table.detailed {\n margin-left:auto; margin-right:auto;\n text-al ign: center;\n border: 0px;\n border-spacing: 0;\n border-collapse: collapse; \n}\n\n";		tos<<"table.detailed {\n margin-left: auto; margin-right: auto;\n text- align: center;\n border: 0px;\n border-spacing: 0;\n border-collapse: collaps e;\n}\n\n";
tos<<"caption {\n\n}\n\n";		tos<<"caption {\n\n}\n\n";
tos<<"thead {\n\n}\n\n";		tos<<"thead {\n\n}\n\n";
//workaround begin.		//workaround begin.
tos<<"/* "<<TimetableExport::tr("Some programs import \"tfoot\" incorrect ly. So we use \"tr.foot\" instead of \"tfoot\".",		tos<<"/* "<<TimetableExport::tr("Some programs import \"tfoot\" incorrect ly. So we use \"tr.foot\" instead of \"tfoot\".",
"Please keep tfoot and tr.foot untranslated, as they are in the original English phrase")<<" */\n\n";		"Please keep tfoot and tr.foot untranslated, as they are in the original English phrase")<<" */\n\n";
//tos<<"tfoot {\n\n}\n\n";		//tos<<"tfoot {\n\n}\n\n";
tos<<"tr.foot {\n\n}\n\n";		tos<<"tr.foot {\n\n}\n\n";
//workaround end		//workaround end
skipping to change at line 2535		skipping to change at line 2535
}		}
for(int room=0; room<gt.rules.nInternalRooms; room++){		for(int room=0; room<gt.rules.nInternalRooms; room++){
tos << "span.r_"<<hashRoomIDsTimetable.value(gt.rules.int ernalRoomsList[room]->name)<<" { /* room "<<gt.rules.internalRoomsList[room]->na me<<" */\n\n}\n\n";		tos << "span.r_"<<hashRoomIDsTimetable.value(gt.rules.int ernalRoomsList[room]->name)<<" { /* room "<<gt.rules.internalRoomsList[room]->na me<<" */\n\n}\n\n";
}		}
}		}
if(TIMETABLE_HTML_LEVEL>=3){		if(TIMETABLE_HTML_LEVEL>=3){
tos<<"span.subject {\n\n}\n\n";		tos<<"span.subject {\n\n}\n\n";
tos<<"span.activitytag {\n\n}\n\n";		tos<<"span.activitytag {\n\n}\n\n";
tos<<"span.empty {\n color: gray;\n}\n\n";		tos<<"span.empty {\n color: gray;\n}\n\n";
tos<<"td.empty {\n border-color:silver;\n border-right-style:no ne;\n border-bottom-style:none;\n border-left-style:dotted;\n border-top-styl e:dotted;\n}\n\n";		tos<<"td.empty {\n border-color: silver;\n border-right-style: none;\n border-bottom-style: none;\n border-left-style: dotted;\n border-top- style: dotted;\n}\n\n";
tos<<"span.notAvailable {\n color: gray;\n}\n\n";		tos<<"span.notAvailable {\n color: gray;\n}\n\n";
tos<<"td.notAvailable {\n border-color:silver;\n border-right-s tyle:none;\n border-bottom-style:none;\n border-left-style:dotted;\n border-t op-style:dotted;\n}\n\n";		tos<<"td.notAvailable {\n border-color: silver;\n border-right- style: none;\n border-bottom-style: none;\n border-left-style: dotted;\n bord er-top-style: dotted;\n}\n\n";
tos<<"span.break {\n color: gray;\n}\n\n";		tos<<"span.break {\n color: gray;\n}\n\n";
tos<<"td.break {\n border-color:silver;\n border-right-style:no ne;\n border-bottom-style:none;\n border-left-style:dotted;\n border-top-styl e:dotted;\n}\n\n";		tos<<"td.break {\n border-color: silver;\n border-right-style: none;\n border-bottom-style: none;\n border-left-style: dotted;\n border-top- style: dotted;\n}\n\n";
tos<<"tr.studentsset, div.studentsset {\n\n}\n\n";		tos<<"tr.studentsset, div.studentsset {\n\n}\n\n";
tos<<"tr.teacher, div.teacher {\n\n}\n\n";		tos<<"tr.teacher, div.teacher {\n\n}\n\n";
tos<<"tr.room, div.room {\n\n}\n\n";		tos<<"tr.room, div.room {\n\n}\n\n";
if(TIMETABLE_HTML_LEVEL!=7){		if(TIMETABLE_HTML_LEVEL!=7){
tos<<"tr.line0, div.line0 {\n font-size: smaller;\n}\n\n ";		tos<<"tr.line0, div.line0 {\n font-size: smaller;\n}\n\n ";
tos<<"tr.line1, div.line1 {\n\n}\n\n";		tos<<"tr.line1, div.line1 {\n\n}\n\n";
tos<<"tr.line2, div.line2 {\n font-size: smaller;\n col or: gray;\n}\n\n";		tos<<"tr.line2, div.line2 {\n font-size: smaller;\n col or: gray;\n}\n\n";
tos<<"tr.line3, div.line3 {\n font-size: smaller;\n col or: silver;\n}\n\n";		tos<<"tr.line3, div.line3 {\n font-size: smaller;\n col or: silver;\n}\n\n";
} else {		} else {
End of changes. 5 change blocks.
5 lines changed or deleted		5 lines changed or added

---