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

[Graeme Foster]

I've added a function that will update the req_req totals. Based on application_onaccept_interactive it does everything except,

create the assignment (although it could quite easily do that if you would prefer)
send the email

It would be possible with a little modification to call this from application_onaccept_interactive to minimise the code duplication. If you want me to do that I can.

Whilst working through the Selenium Tests with Michael we needed to upgrade the Selenium server (the previous one had a b in the version so not certain if it was a beta anyway) But it didn't have support for FF5. Now I realise this is a big file and should be removed from trunk but until I have a script that will prompt for a download it if it is not on the system I'd rather keep it in trunk to make it easier for people to start running the tests. I hope that is all right, if not then let me know and I'll add it to the bzr ignore list.

[Fran Boon (flavour)]

Please add the binary to the bzr ignore list - this will mean an uncommit 1st
- the repo has got huge & this very large binary really need removing rather than making it even bigger (this is what we do for the Google closure compiler.
A Raise if the .jar not found is just fine...a fancy script to auto-download can come later as-opportunity presents.

Yes please to avoid code duplication through nested calls.

review: Needs Fixing

[lp:~graeme-acm/sahana-eden/LA]

2373. By graeme-acm on 2011-08-10

volunteer roster report, and vol application prepop

2374. By graeme-acm on 2011-08-10

merge la

2375. By graeme-acm on 2011-08-11

merge la

2376. By graeme-acm on 2011-08-11

prepopulate fix and some bug fixes

2377. By graeme-acm on 2011-08-11

vol assignment form

2378. By graeme-acm on 2011-08-11

merge la, fix importer bug

2379. By graeme-acm on 2011-08-11

vol assignment form

2380. By graeme-acm on 2011-08-11

merge la

2381. By graeme-acm on 2011-08-12

vol assignment form

2382. By graeme-acm on 2011-08-12

merge la

2383. By graeme-acm on 2011-08-13

volunteer assignment form

2384. By graeme-acm on 2011-08-13

merge la

2385. By graeme-acm on 2011-08-17

merge trunk

2386. By graeme-acm on 2011-08-17

fixes to prepopulate and some pdf reports

2387. By graeme-acm on 2011-08-17

make prepopulate flag a simple numerical flag

2388. By graeme-acm on 2011-08-17

merge trunk

2389. By graeme-acm on 2011-08-18

fix for dateutils and re_req import

2390. By graeme-acm on 2011-08-18

merge trunk

2391. By graeme-acm on 2011-08-18

fix for pre-populate flag in 000_config

2392. By graeme-acm on 2011-08-22

merge trunk

2393. By graeme-acm on 2011-08-22

minor bug fix

2394. By graeme-acm on 2011-08-27

merge trunk

2395. By graeme-acm on 2011-08-27

merge trunk

2396. By graeme-acm on 2011-08-27

changes to vol assignment pdf - see logs

2397. By graeme-acm on 2011-08-27

add volunteer certificate

2398. By graeme-acm on 2011-08-28

fixed bug in volunteer roster

2399. By graeme-acm on 2011-08-28

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

2400. By graeme-acm on 2011-09-01

redo the certificate

2401. By graeme-acm on 2011-09-01

merge trunk

2402. By graeme-acm on 2011-09-01

merge trunk

2403. By graeme-acm on 2011-09-01

vol & don certificates

2404. By graeme-acm on 2011-09-01

merge trunk

2405. By graeme-acm on 2011-09-01

donation certificate

2406. By graeme-acm on 2011-09-02

merge trunk

2407. By graeme-acm on 2011-09-02

logo in volunteer badge

2408. By graeme-acm on 2011-09-02

date represent change and vol assignmnet pdf tweak

2409. By graeme-acm on 2011-09-02

fix date represent for utc

2410. By graeme-acm on 2011-09-02

various fixes logs 152, 227 & 276

2411. By graeme-acm on 2011-09-03

various logs.

2412. By graeme-acm on 2011-09-06

merge trunk

2413. By graeme-acm on 2011-09-06

fix personal menu to give it maximum space available

2414. By graeme-acm on 2011-09-06

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

2415. By graeme-acm on 2011-09-07

some work on the donation form plus fix to log 298

2416. By graeme-acm on 2011-09-07

merge trunk

2417. By graeme-acm on 2011-09-07

donation request from

2418. By graeme-acm on 2011-09-08

restrict an org to commit vols to the slots available

2419. By graeme-acm on 2011-09-08

log 306 - Excel colours

2420. By graeme-acm on 2011-09-11

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

2421. By graeme-acm on 2011-09-12

added a link for printing of a volunteer certificate

2422. By graeme-acm on 2011-09-12

breadcrumbs and warnings were overlapping

2423. By graeme-acm on 2011-09-12

merge trunk - resolve conflict

2424. By graeme-acm on 2011-09-12

fix emergency contacts on pre-populate

2425. By graeme-acm on 2011-09-12

merge trunk

2426. By graeme-acm on 2011-09-13

Update Help add FAQ

2427. By graeme-acm on 2011-09-13

merge trunk

2428. By graeme-acm on 2011-09-14

fix string %(descriptors)s

2429. By graeme-acm on 2011-09-14

merge trunk

2430. By graeme-acm on 2011-09-15

merge trunk

2431. By graeme-acm on 2011-09-15

donation certificate

2432. By graeme-acm on 2011-09-15

donation req signature

2433. By graeme-acm on 2011-09-15

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

2434. By graeme-acm on 2011-09-15

removed comment, confirmation received

2435. By graeme-acm on 2011-09-15

added on validate to the create org popup

2436. By graeme-acm on 2011-09-15

merge trunk

2437. By graeme-acm on 2011-09-15

merge trunk

2438. By graeme-acm on 2011-09-15

merge trunk

2439. By graeme-acm on 2011-09-16

merge trunk

2440. By graeme-acm on 2011-09-16

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

2441. By graeme-acm on 2011-09-25

added selenium scripts used to generate the language file

2442. By graeme-acm on 2011-11-18

merge trunk

2443. By graeme-acm on 2011-11-18

minor tweaks to PDF and xls output

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2011-06-15 15:46:34 +0000
+++ .bzrignore	2011-08-10 16:21:59 +0000
@@ -36,6 +36,7 @@
 tests/prepopulate/user/*
 tests/selenium/results/*
 tests/selenium/scripts/diagTestResults.txt
+tests/selenium/server/selenium-server.jar
 tests/selenium/results/*
 tests/selenium/tests/*
 tests/unit/*.pdf

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2011-08-09 14:44:27 +0000
+++ controllers/vol.py	2011-08-10 16:21:59 +0000
@@ -1234,9 +1234,3 @@
     return s3_rest_controller("project", "task")
 
 # END =========================================================================
-def application():
-    """ REST Controller """
-
-    s3mgr.load("vol_application")
-    output = s3_rest_controller(module, resourcename)
-    return output
\ No newline at end of file

=== modified file 'models/vol.py'
--- models/vol.py	2011-08-09 16:54:13 +0000
+++ models/vol.py	2011-08-10 16:21:59 +0000
@@ -216,6 +216,67 @@
 
             return
 
+        def application_onaccept(req_num):
+            """
+                Check whether full
+                if full:
+                    return false
+                else:
+                    Add a vol_assignment record
+                    Update the req's commit qty
+                    If req now full then return "Full"
+                    Else return True
+            """
+            rrtable = db.req_req
+            rstable = db.req_req_skill
+            query = (rrtable.request_number == req_num) & \
+                    (rrtable.id == rstable.req_id)
+            record = db(query).select(rrtable.id,
+                                      rstable.quantity,
+                                      rstable.quantity_commit,
+                                      limitby=(0, 1)).first()
+            if record and \
+               record.req_req_skill.quantity > record.req_req_skill.quantity_commit:
+                # Lookup the Report To
+                req_id = record.req_req.id
+                _req = db(rrtable.id == req_id).select(rrtable.request_for_id,
+                                                   limitby=(0, 1)).first()
+                if _req:
+                    report_to = _req.request_for_id
+                else:
+                    report_to = None
+                # Add Assignment
+                vatable = db.vol_assignment
+                query = (vatable.req_id == req_id) & \
+                        (vatable.deleted == False)
+                rows = db(query).select(vatable.number)
+                qty = 0
+                for row in rows:
+                    qty = qty + row.number
+                if qty >= record.req_req_skill.quantity:
+                    commit_status = 2 # Complete (defined in models/req.py)
+                else:
+                    commit_status = 1 # Partial
+                db(rstable.req_id == req_id).update(quantity_commit = qty)
+                db(rrtable.id == req_id).update(commit_status = commit_status)
+                if commit_status == 2:
+                    return "Full"
+                else:
+                    return True
+            else:
+                return False
+            return
+
+        def vol_application_onaccept_csv(req_csv):
+            from csv import DictReader
+            csvReader = DictReader(open(req_csv, 'rb'))
+            for r in csvReader:
+                # this relies on the named field being in the import file
+                reqNum = r["Request Number"]
+                application_onaccept(reqNum)
+
+
+
         s3mgr.configure(tablename,
                         onvalidation = application_onvalidation,
                         #create_onaccept = application_onaccept,
@@ -765,6 +826,7 @@
         # Pass variables back to global scope (response.s3.*)
         return dict(
             application_onaccept_interactive = application_onaccept_interactive,
+            vol_application_onaccept_csv = vol_application_onaccept_csv,
             vol_rostermail = vol_rostermail,
             )
 

=== modified file 'modules/s3/s3tools.py'
--- modules/s3/s3tools.py	2011-08-08 15:59:19 +0000
+++ modules/s3/s3tools.py	2011-08-10 16:21:59 +0000
@@ -674,6 +674,7 @@
         self.s3base = s3base
         self.importTasks = []
         self.specialTasks = []
+        self.tasks = []
         self.alternateTables = {"hrm_person":  {"tablename":"hrm_human_resource",
                                                 "loader":response.s3.hrm_person_loader,
                                                 "prefix":"pr",
@@ -682,6 +683,7 @@
                                 "req_req_item":{"loader":response.s3.req_item_loader},
                                }
         self.errorList = []
+        self.resultList = []
 
     def load_descriptor(self, path):
         """ Method that will load the descriptor file and then all the
@@ -739,6 +741,7 @@
                         self.errorList.append(
                         "Failed to find a transform file, Giving up.")
                         return
+            self.tasks.append([1,app, res, csv, xsl])
             self.importTasks.append([app, res, csv, xsl])
         else:
             self.errorList.append(
@@ -753,6 +756,7 @@
         extraArgs = None
         if len(details) == 4:
             extraArgs = details[3].strip('" ')
+        self.tasks.append([2,function,csv,extraArgs])
         self.specialTasks.append([function,csv,extraArgs])
 
     def load_import(self, controller, csv, xsl):
@@ -761,23 +765,24 @@
         """
         self.importTasks.append([controller, csv, xsl])
 
-    def execute_import_tasks(self):
+    def execute_import_task(self, task):
         """ Method that will execute each import job, in order """
 
-        manager = self.manager
-        db = current.db
-        request = current.request
-        response = current.response
-        errorString = "prepopulate error: file %s missing"
-        # Store the view
-        view = response.view
+        if task[0] == 1:
+            manager = self.manager
+            db = current.db
+            request = current.request
+            response = current.response
+            errorString = "prepopulate error: file %s missing"
+            # Store the view
+            view = response.view
+    
+            auth = current.auth
+            deployment_settings = auth.deployment_settings
 
-        auth = current.auth
-        deployment_settings = auth.deployment_settings
-        for job in self.importTasks:
-            _debug ("Running job %s %s (filename=%s transform=%s)" % (job[0], job[1], job[2], job[3]))
-            prefix = job[0]
-            name = job[1]
+            _debug ("Running job %s %s (filename=%s transform=%s)" % (task[1], task[2], task[3], task[4]))
+            prefix = task[1]
+            name = task[2]
             tablename = "%s_%s" % (prefix, name)
             if tablename in self.alternateTables:
                 details = self.alternateTables[tablename]
@@ -797,21 +802,21 @@
             # Skip the job if the target table doesn't exist
             if tablename not in db:
                 self.errorList.append("WARNING: Unable to find table %s import job skipped" % tablename)
-                continue
+                return
             # Check if the source file is accessible
             try:
-                csv = open(job[2], "rb")
+                csv = open(task[3], "rb")
             except IOError:
-                self.errorList.append(sys.stderr, errorString % job[2])
-                break
+                self.errorList.append(errorString % task[3])
+                return
             # Check if the stylesheet is accessible
             try:
-                open(job[3], "rb")
+                open(task[4], "rb")
             except IOError:
-                self.errorList.append(errorString % job[3])
-                break
+                self.errorList.append(errorString % task[4])
+                return
             # Create a request
-            vars = dict(filename=job[2], transform=job[3])
+            vars = dict(filename=task[3], transform=task[4])
             r = manager.parse_request(prefix=prefix,
                                       name=name,
                                       args=["create.s3csv"],
@@ -820,16 +825,16 @@
             output = r()
             db.commit()
             _debug ("%s import job completed" % tablename)
-
-        # Restore the view
-        response.view = view
-        self.clear_import_tasks()
-
-    def execute_special_tasks(self):
-        for task in self.specialTasks:
-            fun = task[0]
-            csv = task[1]
-            extraArgs = task[2] 
+    
+            # Restore the view
+            response.view = view
+            self.clear_import_tasks()
+
+    def execute_special_task(self, task):
+        if task[0] == 2:
+            fun = task[1]
+            csv = task[2]
+            extraArgs = task[3] 
             if extraArgs == None:
                 stmt = "%s('%s')" % (fun, csv)
             else:
@@ -845,8 +850,11 @@
             that are listed in the descriptor file
         """
         self.load_descriptor(path)
-        self.execute_special_tasks()
-        self.execute_import_tasks()
+        for task in self.tasks:
+            if task[0] == 1:
+                self.execute_import_task(task)
+            elif task[0] == 2:
+                self.execute_special_task(task)
 
     def perform_task(self, controller, csv, xsl):
         """ convenience method that will load and execute the import job """

=== modified file 'private/prepopulate/demo/LA/tasks.txt'
--- private/prepopulate/demo/LA/tasks.txt	2011-08-09 16:54:13 +0000
+++ private/prepopulate/demo/LA/tasks.txt	2011-08-10 16:21:59 +0000
@@ -14,6 +14,8 @@
 #     zzz_1st_run
 #     s3Tools::S3BulkImporter
 ##########################################################################
+*,self.manager.gis.import_csv,USA_L1.csv
+*,self.manager.gis.import_csv,California_L2.csv
 "auth","user","users.csv","user.xsl"
 "org","organisation","organisation.csv","organisation.xsl"
 "org","office","office.csv","office.xsl"
@@ -24,5 +26,4 @@
 req,req_skill,req_skill.csv,req_skill.xsl
 vol,application,vol_application.csv,application.xsl
 vol,assignment,vol_application.csv,assignment.xsl
-*,self.manager.gis.import_csv,USA_L1.csv
-*,self.manager.gis.import_csv,California_L2.csv
+*,self.manager.s3.vol_application_onaccept_csv,req_req.csv

=== modified file 'tests/selenium/selenium-version'
--- tests/selenium/selenium-version	2011-02-04 21:46:18 +0000
+++ tests/selenium/selenium-version	2011-08-10 16:21:59 +0000
@@ -1,8 +1,8 @@
-Installed version of selenium-server is 2.0a2
+Installed version of selenium-server is 2.3.0
 - the directory has been renamed server
 
 Installed version of selenium-python-client is 1.0.1
 - file selenium.py has been copied to the script directory
 
 Installed version of HTMLTestRunner.py is 0.8.2
-- file has been copied to the script directory
\ No newline at end of file
+- file has been copied to the script directory

=== removed file 'tests/selenium/server/selenium-server.jar'
Binary files tests/selenium/server/selenium-server.jar	2011-03-23 09:36:03 +0000 and tests/selenium/server/selenium-server.jar	1970-01-01 00:00:00 +0000 differ