Sahana-Eden

Merge lp://staging/~graeme-acm/sahana-eden/LA into lp://staging/sahana-eden

  1. LA
  2. Merge into trunk
Proposed by Graeme Foster
Status: Needs review
Proposed branch: lp://staging/~graeme-acm/sahana-eden/LA
Merge into: lp://staging/sahana-eden
Diff against target: 64092 lines (+23365/-32759) (has conflicts)
228 files modified
VERSION (+3/-1)
clean_la.cmd (+11/-0)
controllers/admin.py (+50/-2)
controllers/default.py (+662/-285)
controllers/don.py (+1041/-0)
controllers/event.py (+11/-1)
controllers/gis.py (+3/-2)
controllers/hrm.py (+224/-0)
controllers/master.py (+22/-0)
controllers/org.py (+123/-0)
controllers/project.py (+5/-7)
controllers/req.py (+23/-11)
controllers/supply.py (+16/-1)
controllers/vol.py (+2389/-176)
deployment-templates/models/000_config.py (+278/-115)
languages/ar.py (+2/-1)
languages/de.py (+135/-1)
languages/el.py (+2/-1)
languages/en-gb.py (+8/-8)
languages/es.py (+789/-6437)
languages/fr.py (+2/-1)
languages/it.py (+2/-1)
languages/ja.py (+770/-5669)
languages/ko.py (+848/-4514)
languages/pt-br.py (+2/-1)
languages/pt.py (+2/-1)
languages/ru.py (+2/-1)
languages/tl.py (+114/-22)
languages/ur.py (+2/-1)
languages/vi.py (+950/-5375)
languages/zh-cn.py (+6/-3)
languages/zh-tw.py (+1418/-5944)
models/00_db.py (+0/-1)
models/00_settings.py (+73/-29)
models/00_tables.py (+41/-61)
models/01_menu.py (+683/-227)
models/02_pr.py (+2/-0)
models/03_gis.py (+0/-1)
models/04_pr.py (+83/-6)
models/05_org.py (+550/-94)
models/06_hrm.py (+116/-11)
models/06_supply.py (+118/-72)
models/08_inv.py (+55/-3)
models/09_project.py (+205/-10)
models/asset.py (+1/-1)
models/doc.py (+1/-1)
models/don.py (+750/-0)
models/event.py (+12/-2)
models/req.py (+2386/-0)
models/vol.py (+1987/-74)
models/zzz_1st_roles.py (+204/-61)
models/zzz_1st_run.py (+85/-184)
modules/s3/codecs/xls.py (+11/-4)
modules/s3/s3aaa.py (+30/-31)
modules/s3/s3cfg.py (+4/-0)
modules/s3/s3pdf.py (+82/-14)
modules/s3/s3rest.py (+236/-0)
modules/s3/s3search.py (+7/-2)
modules/s3/s3tools.py (+99/-232)
modules/s3/s3validators.py (+3/-2)
modules/s3/s3widgets.py (+27/-154)
modules/s3/s3xml.py (+2/-2)
modules/test_utils/setup_request_environment.py (+23/-0)
private/prepopulate/default/California_L2.csv (+59/-0)
private/prepopulate/default/StandardItems.csv (+4/-0)
private/prepopulate/default/USA_L1.csv (+52/-0)
private/prepopulate/default/tasks.cfg (+5/-3)
private/prepopulate/demo/LA/California_L2.csv (+59/-0)
private/prepopulate/demo/LA/LASkillList.csv.OTHER (+62/-0)
private/prepopulate/demo/LA/USA_L1.csv (+52/-0)
private/prepopulate/demo/LA/office.csv (+16/-0)
private/prepopulate/demo/LA/organisation.csv (+8/-0)
private/prepopulate/demo/LA/people.csv (+86/-0)
private/prepopulate/demo/LA/req_req.csv.OTHER (+15/-0)
private/prepopulate/demo/LA/req_skill.csv (+12/-0)
private/prepopulate/demo/LA/sector.csv (+21/-0)
private/prepopulate/demo/LA/tasks.cfg.OTHER (+33/-0)
private/prepopulate/demo/LA/users.csv (+86/-0)
private/prepopulate/demo/LA/vol_application.csv (+41/-0)
private/prepopulate/demo/LA/vol_assignment.csv (+41/-0)
private/prepopulate/regression/office.csv (+4/-0)
static/formats/edrm/export.xsl (+18/-0)
static/formats/edrm/import.xsl (+14/-2)
static/formats/s3csv/hrm/person.xsl (+129/-0)
static/formats/s3csv/org/office.xsl (+226/-0)
static/formats/s3csv/org/officela.xsl (+261/-0)
static/formats/s3csv/org/organisation.xsl (+91/-0)
static/formats/s3csv/org/sector.xsl (+38/-0)
static/formats/s3csv/req/req.xsl (+32/-21)
static/formats/s3csv/req/req_skill.xsl (+70/-0)
static/formats/s3csv/vol/application.xsl (+76/-0)
static/formats/s3csv/vol/assignment.xsl (+74/-0)
static/formats/s3csv/vol/contact.xsl (+75/-0)
static/formats/s3csv/vol/req.xsl (+77/-0)
static/index.html (+81/-0)
static/scripts/S3/S3.js (+1/-1)
static/scripts/S3/S3.min.js (+1/-1)
static/scripts/S3/anytimec.js (+0/-789)
static/scripts/S3/i18n/jquery.dataTables.de.js (+17/-0)
static/scripts/S3/i18n/jquery.dataTables.es.js (+17/-0)
static/scripts/S3/i18n/jquery.dataTables.ja.js (+17/-0)
static/scripts/S3/i18n/jquery.dataTables.ko.js (+17/-0)
static/scripts/S3/i18n/jquery.dataTables.tl.js (+17/-0)
static/scripts/S3/i18n/jquery.dataTables.vn.js (+17/-0)
static/scripts/S3/i18n/jquery.dataTables.zh_TW.js (+17/-0)
static/scripts/S3/jquery.ba-resize.js (+249/-0)
static/scripts/S3/jquery.ba-resize.min.js (+9/-0)
static/scripts/S3/jquery.hoverIntent.js (+106/-0)
static/scripts/S3/jquery.hoverIntent.minified.js (+9/-0)
static/scripts/S3/jquery.pstrength.1.3.js (+7/-5)
static/scripts/S3/jquery.pstrength.1.3.min.js (+1/-1)
static/scripts/S3/s3.dataTables.js (+30/-5)
static/scripts/S3/s3.dataTables.min.js (+111/-110)
static/scripts/S3/s3.select_object.js (+136/-0)
static/scripts/S3/s3.select_person.js (+1/-1)
static/scripts/S3/s3.select_person.min.js (+1/-1)
static/styles/S3/anytime.css (+0/-777)
static/styles/S3/anytimec.css (+0/-44)
static/styles/S3/sahana.css (+994/-836)
static/styles/S3/sahana.min.css (+3/-1)
tests/selenium/language-tests/LanguageFileTests (+16/-0)
tests/selenium/language-tests/donate (+87/-0)
tests/selenium/language-tests/visitor (+281/-0)
tests/selenium/language-tests/volunteer (+496/-0)
tests/selenium/selenium-version (+2/-2)
tests/unit_tests/controllers/hrm.py (+233/-0)
tests/unit_tests/models/01_menu.py (+125/-0)
views/_create.html (+2/-2)
views/_delete.html (+1/-1)
views/_display.html (+2/-2)
views/_list.html (+36/-0)
views/_list_create.html (+3/-3)
views/_merge.html (+2/-2)
views/_ocr_page_upload.html (+1/-1)
views/_ocr_upload.html (+1/-1)
views/_search.html (+2/-2)
views/_update.html (+2/-2)
views/admin/export_data.html (+1/-1)
views/admin/groups.html (+1/-1)
views/admin/import_data.html (+1/-1)
views/admin/index.html (+1/-1)
views/admin/role_edit.html (+1/-1)
views/admin/role_list.html (+1/-1)
views/admin/role_users.html (+1/-1)
views/admin/settings.html (+2/-1)
views/admin/users.html (+1/-1)
views/assess/basic_assess.html (+1/-1)
views/assess/index.html (+1/-1)
views/asset/index.html (+1/-1)
views/auth/_login.html (+1/-1)
views/breadcrumbs.html (+6/-0)
views/budget/budget_staff_bundle_header.html (+1/-1)
views/budget/bundle_kit_item_header.html (+1/-1)
views/budget/kit_item_header.html (+1/-1)
views/building/adminLevel.html (+1/-1)
views/building/index.html (+1/-1)
views/building/report.html (+1/-1)
views/building/timeline.html (+1/-1)
views/cr/index.html (+1/-1)
views/default/about.html (+1/-1)
views/default/contact.html (+7/-17)
views/default/disclaimer.html (+13/-0)
views/default/faq.html (+9/-0)
views/default/help.html (+11/-2)
views/default/index.html (+24/-59)
views/default/register.html (+14/-0)
views/default/sitemap.html (+5/-0)
views/default/user.html (+1/-1)
views/default/why.html (+8/-0)
views/delphi/index.html (+1/-1)
views/don/index.html (+69/-0)
views/dvi/index.html (+1/-1)
views/dvr/index.html (+1/-1)
views/errors/index.html (+1/-1)
views/event/index.html (+1/-1)
views/flood/index.html (+1/-1)
views/footer.html (+15/-7)
views/formats.html (+17/-0)
views/gis/catalogue_toolbar.html (+1/-1)
views/gis/legend.html (+11/-11)
views/gis/location_duplicates.html (+1/-1)
views/gis/location_resolve.html (+1/-1)
views/hrm/index.html (+1/-1)
views/importer/index.html (+1/-1)
views/inner_form.html (+109/-0)
views/inv/index.html (+1/-1)
views/irs/index.html (+1/-1)
views/key.html (+1/-1)
views/l10n.js (+0/-1)
views/layout.html (+66/-87)
views/list_create_ext.html (+1/-1)
views/list_ext.html (+1/-1)
views/master/index.html (+15/-0)
views/mobile/settings_update.html (+1/-1)
views/mpr/index.html (+1/-1)
views/msg/_compose.html (+1/-1)
views/msg/api_settings_update.html (+1/-1)
views/msg/contacts.html (+1/-1)
views/msg/email_settings_update.html (+1/-1)
views/msg/group_user_header.html (+1/-1)
views/msg/index.html (+1/-1)
views/msg/modem_settings_update.html (+1/-1)
views/msg/outbox_create.html (+1/-1)
views/msg/setting_display.html (+1/-1)
views/msg/setting_update.html (+1/-1)
views/msg/sms_to_smtp_settings_update.html (+1/-1)
views/msg/tropo_settings_update.html (+1/-1)
views/org/index.html (+1/-1)
views/patient/index.html (+1/-1)
views/pr/index.html (+1/-1)
views/pr/person_duplicates.html (+1/-1)
views/pr/person_presence_list.html (+1/-1)
views/pr/person_presence_list_create.html (+1/-1)
views/pr/person_resolve.html (+1/-1)
views/project/index.html (+1/-1)
views/project/project_search.html (+1/-1)
views/req/index.html (+2/-2)
views/req/req_assignment_update.html (+33/-0)
views/req/req_item_inv_item.html (+1/-1)
views/scenario/index.html (+1/-1)
views/supply/index.html (+26/-0)
views/survey/index.html (+1/-1)
views/ticket/index.html (+1/-1)
views/vehicle/index.html (+1/-1)
views/vol/index.html (+5/-29)
views/vol/profile.html (+10/-0)
views/vol/register.html (+11/-0)
views/vol/req_assignment_update.html (+32/-0)
Text conflict in VERSION
Text conflict in controllers/default.py
Text conflict in controllers/project.py
Text conflict in controllers/req.py
Text conflict in deployment-templates/models/000_config.py
Text conflict in models/01_menu.py
Text conflict in models/04_pr.py
Text conflict in models/05_org.py
Text conflict in models/06_hrm.py
Text conflict in models/06_supply.py
Text conflict in models/08_inv.py
Text conflict in models/09_project.py
Text conflict in models/req.py
Text conflict in models/vol.py
Text conflict in models/zzz_1st_roles.py
Text conflict in modules/s3/s3rest.py
Conflict adding files to private/prepopulate/demo/LA.  Created directory.
Conflict because private/prepopulate/demo/LA is not versioned, but has versioned children.  Versioned directory.
Contents conflict in private/prepopulate/demo/LA/LASkillList.csv
Contents conflict in private/prepopulate/demo/LA/req_req.csv
Contents conflict in private/prepopulate/demo/LA/tasks.cfg
Text conflict in private/prepopulate/regression/office.csv
Text conflict in static/formats/s3csv/hrm/person.xsl
Text conflict in static/formats/s3csv/org/office.xsl
Text conflict in static/formats/s3csv/org/organisation.xsl
Conflict adding file static/formats/s3csv/org/sector.xsl.  Moved existing file to static/formats/s3csv/org/sector.xsl.moved.
Text conflict in static/styles/S3/sahana.min.css
Text conflict in views/_list.html
Text conflict in views/formats.html
Conflict adding file views/supply.  Moved existing file to views/supply.moved.
To merge this branch: bzr merge lp://staging/~graeme-acm/sahana-eden/LA
Reviewer Review Type Date Requested Status
Fran Boon Pending
Review via email: mp+70544@code.staging.launchpad.net

Description of the change

The demo data for prepopulating for a LA

Probably need to add more data but this gives:

L1 & L2 data (list provided)
Organisations (6)
Offices (15)
users (5)
HRM people (5)
HRM skills (list provided 64)
requests donations 3
request items (6)
requests volunteers 2
request skills (2)

To post a comment you must log in.
lp://staging/~graeme-acm/sahana-eden/LA updated
2360. By graeme-acm

merge la

2361. By graeme-acm

merge la

2362. By graeme-acm

add callback for specific reports, allow for different data sources in the pdf table

2363. By graeme-acm

add raw data mode for pdf tables and some cell styling

2364. By graeme-acm

add vol assignments plus some bug fixes in s3import and appadmin

2365. By graeme-acm

fixed vol assignments

2366. By graeme-acm

merge la

2367. By graeme-acm

volunteer roster report

2368. By graeme-acm

volunteer roster report, and vol application prepop

2369. By graeme-acm

merge la

2370. By graeme-acm

merge la

2371. By graeme-acm

volunteer roster report, and vol application prepop

2372. By graeme-acm

merge la

2373. By graeme-acm

volunteer roster report, and vol application prepop

2374. By graeme-acm

merge la

2375. By graeme-acm

merge la

2376. By graeme-acm

prepopulate fix and some bug fixes

2377. By graeme-acm

vol assignment form

2378. By graeme-acm

merge la, fix importer bug

2379. By graeme-acm

vol assignment form

2380. By graeme-acm

merge la

2381. By graeme-acm

vol assignment form

2382. By graeme-acm

merge la

2383. By graeme-acm

volunteer assignment form

2384. By graeme-acm

merge la

2385. By graeme-acm

merge trunk

2386. By graeme-acm

fixes to prepopulate and some pdf reports

2387. By graeme-acm

make prepopulate flag a simple numerical flag

2388. By graeme-acm

merge trunk

2389. By graeme-acm

fix for dateutils and re_req import

2390. By graeme-acm

merge trunk

2391. By graeme-acm

fix for pre-populate flag in 000_config

2392. By graeme-acm

merge trunk

2393. By graeme-acm

minor bug fix

2394. By graeme-acm

merge trunk

2395. By graeme-acm

merge trunk

2396. By graeme-acm

changes to vol assignment pdf - see logs

2397. By graeme-acm

add volunteer certificate

2398. By graeme-acm

fixed bug in volunteer roster

2399. By graeme-acm

fixed bug set margin and then used margins in volunteer assignment report

2400. By graeme-acm

redo the certificate

2401. By graeme-acm

merge trunk

2402. By graeme-acm

merge trunk

2403. By graeme-acm

vol & don certificates

2404. By graeme-acm

merge trunk

2405. By graeme-acm

donation certificate

2406. By graeme-acm

merge trunk

2407. By graeme-acm

logo in volunteer badge

2408. By graeme-acm

date represent change and vol assignmnet pdf tweak

2409. By graeme-acm

fix date represent for utc

2410. By graeme-acm

various fixes logs 152, 227 & 276

2411. By graeme-acm

various logs.

2412. By graeme-acm

merge trunk

2413. By graeme-acm

fix personal menu to give it maximum space available

2414. By graeme-acm

bug fix when adding donation form button (if no rheader bang)

2415. By graeme-acm

some work on the donation form plus fix to log 298

2416. By graeme-acm

merge trunk

2417. By graeme-acm

donation request from

2418. By graeme-acm

restrict an org to commit vols to the slots available

2419. By graeme-acm

log 306 - Excel colours

2420. By graeme-acm

change prepopulate to use new importer code (actual change rolled back until it works with the demos that we have)

2421. By graeme-acm

added a link for printing of a volunteer certificate

2422. By graeme-acm

breadcrumbs and warnings were overlapping

2423. By graeme-acm

merge trunk - resolve conflict

2424. By graeme-acm

fix emergency contacts on pre-populate

2425. By graeme-acm

merge trunk

2426. By graeme-acm

Update Help add FAQ

2427. By graeme-acm

merge trunk

2428. By graeme-acm

fix string %(descriptors)s

2429. By graeme-acm

merge trunk

2430. By graeme-acm

merge trunk

2431. By graeme-acm

donation certificate

2432. By graeme-acm

donation req signature

2433. By graeme-acm

donation add cert and request button and add signature line for certificate

2434. By graeme-acm

removed comment, confirmation received

2435. By graeme-acm

added on validate to the create org popup

2436. By graeme-acm

merge trunk

2437. By graeme-acm

merge trunk

2438. By graeme-acm

merge trunk

2439. By graeme-acm

merge trunk

2440. By graeme-acm

fix for log 347 vol ass form check in and check out time

2441. By graeme-acm

added selenium scripts used to generate the language file

2442. By graeme-acm

merge trunk

2443. By graeme-acm

minor tweaks to PDF and xls output

Unmerged revisions

2443. By graeme-acm

minor tweaks to PDF and xls output

2442. By graeme-acm

merge trunk

2441. By graeme-acm

added selenium scripts used to generate the language file

2440. By graeme-acm

fix for log 347 vol ass form check in and check out time

2439. By graeme-acm

merge trunk

2438. By graeme-acm

merge trunk

2437. By graeme-acm

merge trunk

2436. By graeme-acm

merge trunk

2435. By graeme-acm

added on validate to the create org popup

2434. By graeme-acm

removed comment, confirmation received

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.